From 9707eb2b78f3b725240fe950f5c5acbe02b44a14 Mon Sep 17 00:00:00 2001 From: Alan Greene Date: Wed, 11 Dec 2024 13:47:51 +0000 Subject: [PATCH] Remove unnecessary env files for E2E tests Define the `DASHBOARD_MODE` env var directly in the workflow using the matrix context instead of indirectly via additional env files duplicating the base config. --- .github/workflows/e2e.yml | 4 +++- test/e2e-tests-kind-read-only.env | 3 --- test/e2e-tests-kind-read-write.env | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 test/e2e-tests-kind-read-only.env delete mode 100644 test/e2e-tests-kind-read-write.env diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ce9ef1d74..5582f93ab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -88,6 +88,8 @@ jobs: - name: Run tests working-directory: ${{ github.workspace }}/src/github.com/tektoncd/dashboard + env: + DASHBOARD_MODE: ${{ matrix.dashboard-mode }} run: | ${{ github.workspace }}/scripts/hack/setup-kind.sh \ --registry-url $(echo ${KO_DOCKER_REPO} | cut -d'/' -f 1) \ @@ -95,7 +97,7 @@ jobs: --nodes 3 \ --k8s-version ${{ matrix.k8s-version }} \ --e2e-script ./test/e2e-tests-prow.sh \ - --e2e-env ./test/e2e-tests-kind-${{ matrix.dashboard-mode }}.env + --e2e-env ./test/e2e-tests-kind-prow.env - name: Upload test results uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 diff --git a/test/e2e-tests-kind-read-only.env b/test/e2e-tests-kind-read-only.env deleted file mode 100644 index 0949dabff..000000000 --- a/test/e2e-tests-kind-read-only.env +++ /dev/null @@ -1,3 +0,0 @@ -KO_DOCKER_REPO=registry.local:5000 -SKIP_INITIALIZE=true -DASHBOARD_MODE=read-only diff --git a/test/e2e-tests-kind-read-write.env b/test/e2e-tests-kind-read-write.env deleted file mode 100644 index ef136c997..000000000 --- a/test/e2e-tests-kind-read-write.env +++ /dev/null @@ -1,3 +0,0 @@ -KO_DOCKER_REPO=registry.local:5000 -SKIP_INITIALIZE=true -DASHBOARD_MODE=read-write