From 637a6347c8bcc094b4f2429f13a6261708b4ca8c Mon Sep 17 00:00:00 2001 From: Michael Nairn Date: Wed, 25 Sep 2024 12:11:07 +0100 Subject: [PATCH] ci: Fix GINKGO_FLAGS env var in e2e Ensure the default GINKGO_FLAGS value is always "-v", currently it is an empty string when triggered by anything other than workflow_dispatch. Only run azure tests on pushes to main or release branches, or when triggered using workflow dispatch (manual). Signed-off-by: Michael Nairn --- .github/workflows/ci-e2e.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml index 642da944..f93ddcc7 100644 --- a/.github/workflows/ci-e2e.yaml +++ b/.github/workflows/ci-e2e.yaml @@ -5,6 +5,7 @@ on: branches: - main - "release-*" + - "ci_*" tags: - "v[0-9]+.[0-9]+.[0-9]+" paths-ignore: @@ -39,9 +40,9 @@ on: env: TEST_NAMESPACE: e2e-test - GINKGO_PARALLEL: ${{ inputs.ginkgoParallel }} - GINKGO_DRYRUN: ${{ inputs.ginkgoDryRun }} - GINKGO_FLAGS: ${{ inputs.ginkgoFlags }} + GINKGO_PARALLEL: ${{ inputs.ginkgoParallel || 'false' }} + GINKGO_DRYRUN: ${{ inputs.ginkgoDryRun || 'false' }} + GINKGO_FLAGS: ${{ inputs.ginkgoFlags || '-v' }} jobs: e2e_test_suite: @@ -84,7 +85,7 @@ jobs: export TEST_DNS_NAMESPACES=${{ env.TEST_NAMESPACE }} make test-e2e - name: Run suite Azure - if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' + if: (github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'release-')) || github.event_name == 'workflow_dispatch') run: | export TEST_DNS_PROVIDER_SECRET_NAME=dns-provider-credentials-azure export TEST_DNS_ZONE_DOMAIN_NAME=e2e.azure.hcpapps.net