From 0d2d20c5d56a88ba720865a3c81a330d488d3ef6 Mon Sep 17 00:00:00 2001 From: Todd Anderson Date: Fri, 13 Feb 2026 13:52:40 -0500 Subject: [PATCH 1/2] separating args for v3 from v2 --- .github/actions/contract-tests/action.yml | 10 +++++++--- .github/workflows/nightly-contract-tests.yml | 2 +- lib/sdk/server/Makefile | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/actions/contract-tests/action.yml b/.github/actions/contract-tests/action.yml index 00fce26..11aea5b 100644 --- a/.github/actions/contract-tests/action.yml +++ b/.github/actions/contract-tests/action.yml @@ -8,8 +8,12 @@ inputs: description: 'Github token, used for contract tests' required: false default: '' - test_harness_params: - description: 'Optional extra parameters for the SDK test harness (e.g. -enable-long-running-tests). Passed as TEST_HARNESS_PARAMS to make.' + test_harness_params_v2: + description: 'Optional extra parameters for the SDK test harness v2. Passed as TEST_HARNESS_PARAMS_V2 to make.' + required: false + default: '' + test_harness_params_v3: + description: 'Optional extra parameters for the SDK test harness v3 (e.g. -enable-long-running-tests). Passed as TEST_HARNESS_PARAMS_V3 to make.' required: false default: '' @@ -18,4 +22,4 @@ runs: steps: - name: Run contract tests shell: bash - run: make contract-tests -C ${{ inputs.workspace_path }} TEST_HARNESS_PARAMS="${{ inputs.test_harness_params }}" + run: make contract-tests -C ${{ inputs.workspace_path }} TEST_HARNESS_PARAMS_V2="${{ inputs.test_harness_params_v2 }}" TEST_HARNESS_PARAMS_V3="${{ inputs.test_harness_params_v3 }}" diff --git a/.github/workflows/nightly-contract-tests.yml b/.github/workflows/nightly-contract-tests.yml index aac2977..14a0db3 100644 --- a/.github/workflows/nightly-contract-tests.yml +++ b/.github/workflows/nightly-contract-tests.yml @@ -34,7 +34,7 @@ jobs: with: workspace_path: 'lib/sdk/server' token: ${{ secrets.GITHUB_TOKEN }} - test_harness_params: '-enable-long-running-tests' + test_harness_params_v3: '-enable-long-running-tests' notify-slack-on-failure: runs-on: ubuntu-latest diff --git a/lib/sdk/server/Makefile b/lib/sdk/server/Makefile index 262ca5b..a22e0df 100644 --- a/lib/sdk/server/Makefile +++ b/lib/sdk/server/Makefile @@ -14,8 +14,9 @@ SUPPRESSION_FILE=contract-tests/test-suppressions.txt SUPPRESSION_FILE_FDV2=contract-tests/test-suppressions-fdv2.txt # Add any extra sdk-test-harness parameters here, such as -skip for tests that are -# temporarily not working. -TEST_HARNESS_PARAMS= +# v2 and v3 params are separated because v3 supports additional parameters that v2 does not. +TEST_HARNESS_PARAMS_V2= +TEST_HARNESS_PARAMS_V3= build-contract-tests: @cd contract-tests && ../gradlew installDist @@ -30,10 +31,10 @@ start-contract-test-service-bg: run-contract-tests: @echo "Running SDK contract test v2..." @curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v2/downloader/run.sh \ - | VERSION=v2 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -skip-from=$(SUPPRESSION_FILE) $(TEST_HARNESS_PARAMS)" sh + | VERSION=v2 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -skip-from=$(SUPPRESSION_FILE) $(TEST_HARNESS_PARAMS_V2)" sh @echo "Running SDK contract test v3.0.0-alpha.1..." @curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v3.0.0-alpha.3/downloader/run.sh \ - | VERSION=v3.0.0-alpha.3 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -stop-service-at-end -skip-from=$(SUPPRESSION_FILE_FDV2) $(TEST_HARNESS_PARAMS)" sh + | VERSION=v3.0.0-alpha.3 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -stop-service-at-end -skip-from=$(SUPPRESSION_FILE_FDV2) $(TEST_HARNESS_PARAMS_V3)" sh contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests From 8fdee1d870f0534395fab6c73e7f53816503c489 Mon Sep 17 00:00:00 2001 From: Todd Anderson Date: Fri, 13 Feb 2026 13:56:08 -0500 Subject: [PATCH 2/2] fixing log message --- lib/sdk/server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sdk/server/Makefile b/lib/sdk/server/Makefile index a22e0df..91c66dd 100644 --- a/lib/sdk/server/Makefile +++ b/lib/sdk/server/Makefile @@ -32,7 +32,7 @@ run-contract-tests: @echo "Running SDK contract test v2..." @curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v2/downloader/run.sh \ | VERSION=v2 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -skip-from=$(SUPPRESSION_FILE) $(TEST_HARNESS_PARAMS_V2)" sh - @echo "Running SDK contract test v3.0.0-alpha.1..." + @echo "Running SDK contract test v3..." @curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v3.0.0-alpha.3/downloader/run.sh \ | VERSION=v3.0.0-alpha.3 PARAMS="-url http://localhost:$(TEST_SERVICE_PORT) -debug -stop-service-at-end -skip-from=$(SUPPRESSION_FILE_FDV2) $(TEST_HARNESS_PARAMS_V3)" sh