From 4ca928408c055a8a818dffb9dbf58cd80500b32f Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@uk.ibm.com>
Date: Mon, 9 Dec 2024 15:31:57 +0000
Subject: [PATCH] Improve gha k8s e2e tests names

Change the job names so that the names do not need to changes
when things like k8s versions change. This helps with keeping
the prow/tide configuration of required jobs fixed.

Signed-off-by: Andrea Frittoli <andrea.frittoli@uk.ibm.com>
---
 .github/workflows/chatops_retest.yaml |  2 +-
 .github/workflows/e2e-matrix.yml      | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/chatops_retest.yaml b/.github/workflows/chatops_retest.yaml
index 31d950a6f95..8a2462b7b16 100644
--- a/.github/workflows/chatops_retest.yaml
+++ b/.github/workflows/chatops_retest.yaml
@@ -78,4 +78,4 @@ jobs:
         token: ${{ secrets.CHATOPS_TOKEN }}
         repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
         comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-        reaction-type: hooray
\ No newline at end of file
+        reactions: hooray
\ No newline at end of file
diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml
index 299c152cc3b..9d824c7fed7 100644
--- a/.github/workflows/e2e-matrix.yml
+++ b/.github/workflows/e2e-matrix.yml
@@ -16,16 +16,27 @@ jobs:
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:
-        k8s-version:
-        - v1.28.x
-        - v1.29.x
+        k8s-name:
+        - k8s-oldest
+        - k8s-plus-one
 
         feature-flags:
-        - prow
-        - prow-beta
-        - prow-alpha
+        - stable
+        - beta
+        - alpha
         # - prow-feature-flags  - this is tested today as a periodic job, but we could integrate it here
 
+        include:
+        - k8s-name: k8s-oldest
+          k8s-version: 1.28.x
+        - k8s-name: k8s-plus-one
+          k8s-version: 1.29.x
+        - feature-flags: stable
+          env-file: prow
+        - feature-flags: alpha
+          env-file: prow-alpha
+        - feature-flags: beta
+          env-file: prow-beta
     env:
       GOPATH: ${{ github.workspace }}
       GO111MODULE: on
@@ -73,7 +84,7 @@ jobs:
           --nodes 3 \
           --k8s-version ${{ matrix.k8s-version }} \
           --e2e-script ./test/e2e-tests.sh \
-          --e2e-env ./test/e2e-tests-kind-${{ matrix.feature-flags }}.env
+          --e2e-env ./test/e2e-tests-kind-${{ matrix.env-file }}.env
 
     - name: Upload test results
       uses: actions/upload-artifact@v4