Skip to content

Commit b6b1b68

Browse files
authored
fix: run-e2e-tests quarantine behaviour (#1449)
1 parent bde1aaf commit b6b1b68

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/run-e2e-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,7 @@ jobs:
714714
TEST_CONFIG_OVERRIDE_PATH: ${{ matrix.tests.test_config_override_path ||
715715
inputs.test_config_override_path }}
716716
TEST_ID: ${{ matrix.tests.id_sanitized || matrix.tests.id }}
717+
QUARANTINE: ${{ inputs.quarantine }}
717718
steps:
718719
- name: Enable S3 Cache for Self-Hosted Runners
719720
# these env vars are set (and exposed) when it is a self-hosted runner with extras=s3-cache
@@ -840,7 +841,8 @@ jobs:
840841
id: run_tests
841842
timeout-minutes: ${{ matrix.tests.timeout_minutes || inputs.test-timeout-minutes }}
842843
uses: smartcontractkit/.github/actions/ctf-run-tests@ctf-run-tests/0.11.0
843-
continue-on-error: ${{ inputs.quarantine == 'true' }} # auto-quarantine will handle result
844+
# jankiness because: github.com/actions/runner/issues/1492 + github.com/actions/runner/issues/2418
845+
continue-on-error: ${{ fromJSON(env.QUARANTINE) }}
844846
env:
845847
DETACH_RUNNER: true
846848
RUN_QUARANTINED_TESTS: "true" # always run quarantined tests in CI
@@ -1074,6 +1076,7 @@ jobs:
10741076
TEST_CONFIG_OVERRIDE_PATH: ${{ matrix.tests.test_config_override_path ||
10751077
inputs.test_config_override_path }}
10761078
TEST_ID: ${{ matrix.tests.id_sanitized || matrix.tests.id }}
1079+
QUARANTINE: ${{ inputs.quarantine }}
10771080
steps:
10781081
- name: Enable S3 Cache for Self-Hosted Runners
10791082
# these env vars are set (and exposed) when it is a self-hosted runner with extras=s3-cache
@@ -1151,7 +1154,8 @@ jobs:
11511154
id: run_tests
11521155
timeout-minutes: ${{ matrix.tests.timeout_minutes || inputs.test-timeout-minutes }}
11531156
uses: smartcontractkit/.github/actions/ctf-run-tests@ctf-run-tests/0.11.0
1154-
continue-on-error: ${{ inputs.quarantine == 'true' }} # auto-quarantine will handle result
1157+
# jankiness because: github.com/actions/runner/issues/1492 + github.com/actions/runner/issues/2418
1158+
continue-on-error: ${{ fromJSON(env.QUARANTINE) }}
11551159
env:
11561160
DETACH_RUNNER: true
11571161
RUN_QUARANTINED_TESTS: "true" # always run quarantined tests in CI

0 commit comments

Comments
 (0)