Move failure notif to step for more information

thoughtbot · Apr 11, 2024 · d0c463c · d0c463c
1 parent 8980173
commit d0c463c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/.github/workflows/acceptance.yaml b/.github/workflows/acceptance.yaml
@@ -10,12 +10,6 @@ permissions:
   checks: write
 
 jobs:
-  fail_test:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Fail Test
-        run: exit 1
-
   apply_network:
     name: Apply Network
     uses: ./.github/workflows/terraform.yaml
@@ -114,22 +108,3 @@ jobs:
       terraform_command: destroy
     secrets:
       AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-
-  notify_slack:
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        shell: bash
-    steps:
-    - name: Notify Slack
-      if: failure()
-      uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # v1.23.0
-      continue-on-error: true
-      with:
-        channel-id: '#mission-control'
-        payload: |
-          {
-            "text": "TEST_MESSAGE, IGNORE - 'Flightdeck acceptance tests have failed.'",
-          }
-      env:
-        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
diff --git a/.github/workflows/terraform.yaml b/.github/workflows/terraform.yaml
@@ -16,6 +16,10 @@ on:
         description: AWS account in which Terraform will run
         required: true
 
+env:
+  # SLACK_CHANNEL: '#mission-control'
+  SLACK_CHANNEL: '#testing-please-ignore'
+
 jobs:
   plan:
     name: Terraform
@@ -92,3 +96,15 @@ jobs:
       run: |
         terraform ${{ inputs.terraform_command }} -auto-approve
 
+    - name: Notify Slack
+      if: failure()
+      uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # v1.23.0
+      continue-on-error: true
+      with:
+        channel-id: ${{ env.SLACK_CHANNEL }}
+        payload: |
+          {
+            "text": "TEST_MESSAGE, IGNORE - 'Flightdeck acceptance tests have failed on terraform steps. Module: ${{ inputs.module }}, with command: ${{ inputs.command}}'",
+          }
+      env:
+        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -8,6 +8,8 @@ on:
 
 env:
   KUBECONFIG: /tmp/kubeconfig
+  # SLACK_CHANNEL: '#mission-control'
+  SLACK_CHANNEL: '#testing-please-ignore'
 
 jobs:
   plan:
@@ -68,3 +70,16 @@ jobs:
         make tests \
           ADDRESS=https://${{ github.ref_name }}.flightdeck-test.thoughtbot.com \
           CLUSTER="$CLUSTER"
+
+    - name: Notify Slack
+      if: failure()
+      uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # v1.23.0
+      continue-on-error: true
+      with:
+        channel-id: ${{ env.SLACK_CHANNEL }}
+        payload: |
+          {
+            "text": "TEST_MESSAGE, IGNORE - 'Flightdeck acceptance tests have failed on the cluster.'",
+          }
+      env:
+        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}