From 1101c6a79dcc1a5cc12843c5fb7db650407d7488 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Fri, 10 Nov 2023 16:56:33 -0600 Subject: [PATCH] etcd-e2d-test:rename e2e-arm64 file and runs it on every pull request Recently in #16801 we introduced on demand github actions runners for the arm64 platform. Having on demand runner infrastructure in place means we should now have enough capacity to begin running arm64 tests for every pull request. Currently we have: .github/workflows/e2e-arm64-template.yaml - Shared template .github/workflows/e2e-arm64-nightly.yaml - Runs template against both release-3.5 and main branches nightly. Moving forward we can just rename .github/workflows/e2e-arm64-template.yaml to .github/workflows/e2e-arm64.yaml and delete the other file. We can then just make the template file a standard workflow that will run on pull request. Signed-off-by: Ming Li --- .github/workflows/e2e-arm64-nightly.yaml | 21 ------------------- ...e2e-arm64-template.yaml => e2e-arm64.yaml} | 9 ++------ 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/e2e-arm64-nightly.yaml rename .github/workflows/{e2e-arm64-template.yaml => e2e-arm64.yaml} (88%) diff --git a/.github/workflows/e2e-arm64-nightly.yaml b/.github/workflows/e2e-arm64-nightly.yaml deleted file mode 100644 index 45ebbc194b9..00000000000 --- a/.github/workflows/e2e-arm64-nightly.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: E2E Arm64 Nightly -permissions: read-all -on: - # schedules always run against the main branch, hence we have to create separate jobs - # with individual checkout actions for each of the active release branches - schedule: - - cron: '30 1 * * *' # runs daily at 1:30 am. - - # workflow_dispatch enables manual testing of this job by maintainers - workflow_dispatch: - -jobs: - main-arm64: - uses: ./.github/workflows/e2e-arm64-template.yaml - with: - etcdBranch: main - release-35-arm64: - uses: ./.github/workflows/e2e-arm64-template.yaml - with: - etcdBranch: release-3.5 diff --git a/.github/workflows/e2e-arm64-template.yaml b/.github/workflows/e2e-arm64.yaml similarity index 88% rename from .github/workflows/e2e-arm64-template.yaml rename to .github/workflows/e2e-arm64.yaml index 2fad7039786..86fc5bb2c13 100644 --- a/.github/workflows/e2e-arm64-template.yaml +++ b/.github/workflows/e2e-arm64.yaml @@ -1,11 +1,6 @@ --- name: Reusable Arm64 E2E Workflow -on: - workflow_call: - inputs: - etcdBranch: - required: true - type: string +on: [push, pull_request] permissions: read-all jobs: test: @@ -20,7 +15,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - ref: "${{ inputs.etcdBranch }}" + ref: "main" - id: goversion run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0