Merge pull request rancher#465 from mjura/e2e-workflow

Final e2e workflow update
yiannistri · Apr 16, 2024 · c0f0bfa · c0f0bfa
2 parents 0b79ad8 + a03d1fd
commit c0f0bfa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 134 deletions.
diff --git a/.github/workflows/e2e-main.yaml → .github/workflows/e2e-branch.yaml b/.github/workflows/e2e-main.yaml → .github/workflows/e2e-branch.yaml
@@ -1,4 +1,4 @@
-name: E2E test main
+name: E2E test branch
 on:
   workflow_call:
     secrets:
@@ -17,11 +17,15 @@ on:
       SLACK_WEBHOOK_URL:
         description: "WebHook URL to use for Slack"
         required: true
+    inputs:
+      branch:
+        type: string
+        default: "release-v2.9"
 
 jobs:
   e2e-tests:
     env:
-      BRANCH: main
+      BRANCH: ${{ inputs.branch }}
       REPO: ttl.sh/aks-operator-ci
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/e2e-release.yaml b/.github/workflows/e2e-release.yaml
diff --git a/.github/workflows/e2e-workflow.yaml b/.github/workflows/e2e-workflow.yaml
@@ -1,44 +1,56 @@
-name: e2e-latest-rancher
+name: Run E2E test workflow
 on:
   workflow_dispatch:
   schedule:
     - cron: 0 22 * * *
 permissions: read-all
 jobs:
   e2e-test-main:
-    uses: ./.github/workflows/e2e-main.yaml
+    uses: ./.github/workflows/e2e-branch.yaml
+    with:
+      branch: main
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  e2e-test-v2.9:
-    uses: ./.github/workflows/e2e-release.yaml
+  e2e-test-v2_9:
+    if: ${{ always() }}
+    needs: e2e-test-main
+    uses: ./.github/workflows/e2e-branch.yaml
+    with:
+      branch: release-v2.9
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-    branch: release-v2.9
-  e2e-test-v2.8:
-    uses: ./.github/workflows/e2e-release.yaml
+  e2e-test-v2_8:
+    if: ${{ always() }}
+    needs: [ e2e-test-main, e2e-test-v2_9 ]
+    uses: ./.github/workflows/e2e-branch.yaml
+    with:
+      branch: release-v2.8
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-    branch: release-v2.8
-  e2e-test-v2.7:
-    uses: ./.github/workflows/e2e-release.yaml
+  e2e-test-v2_7:
+    if: ${{ always() }}
+    needs: [ e2e-test-main, e2e-test-v2_9, e2e-test-v2_8 ]
+    uses: ./.github/workflows/e2e-branch.yaml
+    with:
+      branch: release-v2.7
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-    branch: release-v2.7
+