added gh run id

osmosis-labs · Oct 27, 2024 · 8c4edef · 8c4edef
1 parent 85485a0
commit 8c4edef
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 42 deletions.
diff --git a/.github/workflows/monitoring-limit-geo-e2e-tests.yml b/.github/workflows/monitoring-limit-geo-e2e-tests.yml
@@ -43,7 +43,7 @@ jobs:
         id: monitoring-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: eu-trade-test-results
+          name: eu-trade-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
 
   fe-trade-sg-tests:
@@ -83,7 +83,7 @@ jobs:
         id: monitoring-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: sg-trade-test-results
+          name: sg-trade-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
 
   fe-trade-us-tests:
@@ -120,7 +120,7 @@ jobs:
         id: monitoring-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: us-trade-test-results
+          name: us-trade-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
 
   fe-bot-alert:

diff --git a/.github/workflows/monitoring-swap-geo-e2e-tests.yml b/.github/workflows/monitoring-swap-geo-e2e-tests.yml
@@ -95,42 +95,8 @@ jobs:
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: us-swap-test-results
+          name: us-swap-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
-      - name: Send Slack alert if test fails
-        id: slack
-        if: failure()
-        uses: slackapi/[email protected]
-        with:
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "header",
-                  "text": {
-                    "type": "plain_text",
-                    "text": "🚨 Synthetic Geo Swap Monitoring Tests Failure Alert 🚨"
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*Production App URL:* https://app.osmosis.zone"
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
-                  }
-                }
-              ]
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
   fe-swap-eu-tests:
     timeout-minutes: 15
@@ -171,7 +137,7 @@ jobs:
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: eu-swap-test-results
+          name: eu-swap-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
 
   fe-swap-sg-tests:
@@ -213,14 +179,52 @@ jobs:
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: sg-swap-test-results
+          name: sg-swap-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
 
+  fe-bot-alert:
+    runs-on: ubuntu-latest
+    needs: [fe-swap-us-tests, fe-swap-eu-tests, fe-swap-sg-tests]
+    if: failure()
+    steps:
+      - name: Send Slack alert if test fails
+        id: slack
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": "🚨 Synthetic Prod Swap Monitoring Tests Failure Alert 🚨"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
   delete-deployments:
     runs-on: ubuntu-latest
     if: always()
     needs:
-      [fe-quote-tests, fe-swap-us-tests, fe-swap-sg-tests, fe-swap-eu-tests]
+      [
+        fe-quote-tests,
+        fe-swap-us-tests,
+        fe-swap-sg-tests,
+        fe-swap-eu-tests,
+        fe-bot-alert,
+      ]
     steps:
       - name: Delete Previous deployments
         uses: actions/github-script@v7

diff --git a/.github/workflows/prod-frontend-e2e-tests.yml b/.github/workflows/prod-frontend-e2e-tests.yml
@@ -65,7 +65,7 @@ jobs:
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: main-e2e-test-results
+          name: main-e2e-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
       - name: Send Slack alert if test fails
         id: slack