Merge pull request #4389 from cloud-gov/fix-ci

ci: remove pipeline duplication, fix production formatting
cloud-gov · Feb 22, 2024 · 5636457 · 5636457
2 parents 122842a + f6ffa27
commit 5636457
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/ci/pipeline-production.yml b/ci/pipeline-production.yml
@@ -109,16 +109,6 @@ jobs:
             username: ((slack-username))
             icon_url: ((slack-icon-url))
 
-        on_failure:
-          put: slack
-          params:
-            text: |
-              :x: FAILED: to migrate database for pages ((deploy-env))
-              <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
-            channel: ((slack-channel))
-            username: ((slack-username))
-            icon_url: ((slack-icon-url))
-
     on_failure:
       put: slack
       params:
@@ -174,24 +164,24 @@ jobs:
               CF_APP_NAME: pages-admin-((deploy-env))
 
     on_failure:
-      - put: slack
-        params:
-          text: |
-            :x: FAILED: admin client deployment on pages ((deploy-env))
-            <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
-          channel: ((slack-channel))
-          username: ((slack-username))
-          icon_url: ((slack-icon-url))
+      put: slack
+      params:
+        text: |
+          :x: FAILED: admin client deployment on pages ((deploy-env))
+          <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
+        channel: ((slack-channel))
+        username: ((slack-username))
+        icon_url: ((slack-icon-url))
 
     on_success:
-      - put: slack
-        params:
-          text: |
-            :white_check_mark: SUCCESS: Successfully deployed admin client on pages ((deploy-env))
-            <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
-          channel: ((slack-channel))
-          username: ((slack-username))
-          icon_url: ((slack-icon-url))
+      put: slack
+      params:
+        text: |
+          :white_check_mark: SUCCESS: Successfully deployed admin client on pages ((deploy-env))
+          <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
+        channel: ((slack-channel))
+        username: ((slack-username))
+        icon_url: ((slack-icon-url))
 
   - name: deploy-queues-ui-pages-((deploy-env))
     plan:

diff --git a/ci/pipeline-staging.yml b/ci/pipeline-staging.yml
@@ -110,16 +110,6 @@ jobs:
             username: ((slack-username))
             icon_url: ((slack-icon-url))
 
-        on_failure:
-          put: slack
-          params:
-            text: |
-              :x: FAILED: to migrate database for pages ((deploy-env))
-              <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME?vars.deploy-env="((deploy-env))"|View build details>
-            channel: ((slack-channel))
-            username: ((slack-username))
-            icon_url: ((slack-icon-url))
-
     on_failure:
       put: slack
       params: