From 23a0946e76e80b5674fd76096cf6e0edd9f00556 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 24 Oct 2022 16:46:21 +0200 Subject: [PATCH 1/2] Integration, remove retry The retry has no real function as it will just fail on "container exists" on the old tests and the new test will just try forever before it eventually fails. Signed-off-by: Kristoffer Dalby --- .github/workflows/test-integration-cli.yml | 7 +------ .github/workflows/test-integration-derp.yml | 7 +------ .github/workflows/test-integration-general.yml | 7 +------ .github/workflows/test-integration-oidc.yml | 6 +----- .github/workflows/test-integration-v2-general.yml | 7 +------ 5 files changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test-integration-cli.yml b/.github/workflows/test-integration-cli.yml index de288fd973..aecc98a65b 100644 --- a/.github/workflows/test-integration-cli.yml +++ b/.github/workflows/test-integration-cli.yml @@ -32,9 +32,4 @@ jobs: - name: Run CLI integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_cli + run: nix develop --command -- make test_integration_cli diff --git a/.github/workflows/test-integration-derp.yml b/.github/workflows/test-integration-derp.yml index 88b7cf47bd..0e829017fb 100644 --- a/.github/workflows/test-integration-derp.yml +++ b/.github/workflows/test-integration-derp.yml @@ -32,9 +32,4 @@ jobs: - name: Run Embedded DERP server integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_derp + run: nix develop --command -- make test_integration_derp diff --git a/.github/workflows/test-integration-general.yml b/.github/workflows/test-integration-general.yml index 01b31d969d..8e393e6831 100644 --- a/.github/workflows/test-integration-general.yml +++ b/.github/workflows/test-integration-general.yml @@ -32,9 +32,4 @@ jobs: - name: Run general integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_general + run: nix develop --command -- make test_integration_general diff --git a/.github/workflows/test-integration-oidc.yml b/.github/workflows/test-integration-oidc.yml index e8afc1bf2c..d365902b36 100644 --- a/.github/workflows/test-integration-oidc.yml +++ b/.github/workflows/test-integration-oidc.yml @@ -33,8 +33,4 @@ jobs: - name: Run OIDC integration tests if: steps.changed-files.outputs.any_changed == 'true' uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_oidc + run: nix develop --command -- make test_integration_oidc diff --git a/.github/workflows/test-integration-v2-general.yml b/.github/workflows/test-integration-v2-general.yml index fdd98d079e..7c212aa175 100644 --- a/.github/workflows/test-integration-v2-general.yml +++ b/.github/workflows/test-integration-v2-general.yml @@ -32,9 +32,4 @@ jobs: - name: Run general integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_v2_general + run: nix develop --command -- make test_integration_v2_general From 2b10226618402d148f3e4aff6a2475ef6eb34213 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 24 Oct 2022 16:48:25 +0200 Subject: [PATCH 2/2] Remove extra line Signed-off-by: Kristoffer Dalby --- .github/workflows/test-integration-oidc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-integration-oidc.yml b/.github/workflows/test-integration-oidc.yml index d365902b36..ac28be5e8d 100644 --- a/.github/workflows/test-integration-oidc.yml +++ b/.github/workflows/test-integration-oidc.yml @@ -32,5 +32,4 @@ jobs: - name: Run OIDC integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 run: nix develop --command -- make test_integration_oidc