From 23a0946e76e80b5674fd76096cf6e0edd9f00556 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 24 Oct 2022 16:46:21 +0200 Subject: [PATCH 1/3] 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 de288fd9..aecc98a6 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 88b7cf47..0e829017 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 01b31d96..8e393e68 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 e8afc1bf..d365902b 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 fdd98d07..7c212aa1 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/3] 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 d365902b..ac28be5e 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 From 86c132c8b26a90e86eaf186f323bc86ab70c75b8 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 24 Oct 2022 17:14:55 +0200 Subject: [PATCH 3/3] Remove verbose flag for v2 tests, increase timeout Signed-off-by: Kristoffer Dalby --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 431e1076..36b64181 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ test_integration_v2_general: -v $$PWD:$$PWD -w $$PWD/integration \ -v /var/run/docker.sock:/var/run/docker.sock \ golang:1 \ - go test ./... -timeout 15m -v + go test ./... -timeout 30m coverprofile_func: go tool cover -func=coverage.out