From 5bba187a6c2d265090c57ba20e1c5ad4dd4b8802 Mon Sep 17 00:00:00 2001 From: Charlie McBride Date: Thu, 9 Nov 2023 12:53:04 -0800 Subject: [PATCH 1/4] add git_ref for manual trigger to allow testing on branches --- .github/workflows/resolve-args.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/resolve-args.yaml b/.github/workflows/resolve-args.yaml index 1203b5082..b49470844 100644 --- a/.github/workflows/resolve-args.yaml +++ b/.github/workflows/resolve-args.yaml @@ -18,6 +18,8 @@ jobs: run: | if [[ "${{ github.event_name }}" == "workflow_run" ]]; then echo GIT_REF="$(tail -n 1 /tmp/artifacts/metadata.txt)" >> "$GITHUB_OUTPUT" + elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then + echo GIT_REF="${{ github.ref }}" >> "$GITHUB_OUTPUT" else echo GIT_REF="" >> "$GITHUB_OUTPUT" fi From f9312eeba821d1061835039e3f814807f18df0b3 Mon Sep 17 00:00:00 2001 From: Charlie McBride Date: Thu, 9 Nov 2023 12:57:39 -0800 Subject: [PATCH 2/4] change to sha so there's no chance that it will change throughtout the test --- .github/workflows/resolve-args.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/resolve-args.yaml b/.github/workflows/resolve-args.yaml index b49470844..4f743285f 100644 --- a/.github/workflows/resolve-args.yaml +++ b/.github/workflows/resolve-args.yaml @@ -19,7 +19,7 @@ jobs: if [[ "${{ github.event_name }}" == "workflow_run" ]]; then echo GIT_REF="$(tail -n 1 /tmp/artifacts/metadata.txt)" >> "$GITHUB_OUTPUT" elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then - echo GIT_REF="${{ github.ref }}" >> "$GITHUB_OUTPUT" + echo GIT_REF="${{ github.sha }}" >> "$GITHUB_OUTPUT" else echo GIT_REF="" >> "$GITHUB_OUTPUT" fi From 20a5bb90894f82727f89da2af88d1feaddac2731 Mon Sep 17 00:00:00 2001 From: Charlie McBride Date: Fri, 10 Nov 2023 10:12:22 -0800 Subject: [PATCH 3/4] add another test case to the matrix as a test --- .github/workflows/e2e-matrix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-matrix.yaml b/.github/workflows/e2e-matrix.yaml index d0dfedeaa..6f9f95dea 100644 --- a/.github/workflows/e2e-matrix.yaml +++ b/.github/workflows/e2e-matrix.yaml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - suite: [Nonbehavioral, Utilization, GPU, Drift, Integration] + suite: [Nonbehavioral, Utilization, GPU, Drift, Integration, Another] uses: ./.github/workflows/e2e.yaml with: git_ref: ${{ inputs.git_ref }} From eb9796c81370d9309747eba4f01b9f31ce3245f0 Mon Sep 17 00:00:00 2001 From: Charlie McBride Date: Wed, 15 Nov 2023 11:44:21 -0800 Subject: [PATCH 4/4] remove fake test matrix --- .github/workflows/e2e-matrix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-matrix.yaml b/.github/workflows/e2e-matrix.yaml index 6f9f95dea..d0dfedeaa 100644 --- a/.github/workflows/e2e-matrix.yaml +++ b/.github/workflows/e2e-matrix.yaml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - suite: [Nonbehavioral, Utilization, GPU, Drift, Integration, Another] + suite: [Nonbehavioral, Utilization, GPU, Drift, Integration] uses: ./.github/workflows/e2e.yaml with: git_ref: ${{ inputs.git_ref }}