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 <[email protected]>
tektoncd · Dec 10, 2024 · 3bede80 · 3bede80
1 parent d306d64
commit 3bede80
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git 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
+        reactions: hooray
diff --git 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: v1.28.x
+        - k8s-name: k8s-plus-one
+          k8s-version: v1.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