From 9e7d41de48c2a795b94eafcae95bc3705f100166 Mon Sep 17 00:00:00 2001
From: Hidetake Iwata <int128@gmail.com>
Date: Tue, 11 Feb 2025 17:02:33 +0900
Subject: [PATCH] Refactor e2e-test workflows

---
 .github/workflows/build.yaml              |  6 +++---
 .github/workflows/reusable--e2e-test.yaml | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8751ce07..55dd91f4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ on:
       - '*'
 
 jobs:
-  build-ubuntu22:
+  build-latest:
     uses: ./.github/workflows/reusable--build.yaml
     permissions:
       contents: read
@@ -26,7 +26,7 @@ jobs:
 
   e2e-test:
     needs:
-      - build-ubuntu22
+      - build-latest
       - build-ubuntu20
     uses: ./.github/workflows/reusable--e2e-test.yaml
     secrets: inherit
@@ -34,5 +34,5 @@ jobs:
       contents: read
       actions: write
     with:
-      runner-image-uri-ubuntu22: ${{ needs.build-ubuntu22.outputs.image-uri }}
+      runner-image-uri-latest: ${{ needs.build-latest.outputs.image-uri }}
       runner-image-uri-ubuntu20: ${{ needs.build-ubuntu20.outputs.image-uri }}
diff --git a/.github/workflows/reusable--e2e-test.yaml b/.github/workflows/reusable--e2e-test.yaml
index d35642bf..78212dbd 100644
--- a/.github/workflows/reusable--e2e-test.yaml
+++ b/.github/workflows/reusable--e2e-test.yaml
@@ -3,10 +3,10 @@ name: e2e-test
 on:
   workflow_call:
     inputs:
-      runner-image-uri-ubuntu22:
+      runner-image-uri-latest:
         type: string
         required: true
-        description: Image URI of runner
+        description: Image URI of runner (latest)
       runner-image-uri-ubuntu20:
         type: string
         required: true
@@ -41,22 +41,26 @@ jobs:
           APP_INSTALLATION_ID: ${{ secrets.E2E_TEST_APP_INSTALLATION_ID }}
           APP_PRIVATE_KEY: ${{ secrets.E2E_TEST_APP_PRIVATE_KEY }}
       - run: make controller
+
       - run: make runner-scale-set
         env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu22
-          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu22 }}
+          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
+          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
       - run: make runner-scale-set
         env:
           ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
           ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu20 }}
+
+      # Register a dummy runner scale set to ensure GitHub picks the jobs.
       - run: sleep 60
       - run: make runner-scale-set
         env:
           ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-dummy
-          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu22 }}
+          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
+
       - run: make wait-for-runner
         env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu22
+          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
       - run: make wait-for-runner
         env:
           ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
@@ -86,13 +90,13 @@ jobs:
               run_id: context.runId,
             })
 
-  ubuntu22:
+  runner-latest:
     uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
     with:
-      runner-name: ${{ inputs.runner-base-name }}-ubuntu22
+      runner-name: ${{ inputs.runner-base-name }}-latest
       expected-image-os: ubuntu22
 
-  ubuntu20:
+  runner-ubuntu20:
     uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
     with:
       runner-name: ${{ inputs.runner-base-name }}-ubuntu20