Merge pull request #924 from usagov/stage

Sprint 65 release to PROD
usagov · Aug 14, 2024 · f416cd5 · f416cd5
2 parents 1844558 + 7551be7
commit f416cd5
Show file tree

Hide file tree

Showing 69 changed files with 1,004 additions and 841 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -160,6 +160,7 @@ jobs:
             cf install-plugin -f https://github.com/cloud-gov/cf-service-connect/releases/download/v1.1.3/cf-service-connect_linux_amd64
       - run:
           name: "Run downsync"
+          no_output_timeout: 30m
           command: |
             source ./scripts/pipeline/exports.sh "${BACKUP_ENV}"
             source ./scripts/pipeline/cloud-gov-login.sh
@@ -212,6 +213,7 @@ jobs:
             cf install-plugin -f https://github.com/cloud-gov/cf-service-connect/releases/download/v1.1.3/cf-service-connect_linux_amd64
       - run:
           name: "Run backup"
+          no_output_timeout: 30m
           command: |
             export BACKUP_ENV=${CIRCLE_BRANCH}
             source ./scripts/pipeline/exports.sh "${CIRCLE_BRANCH}"
@@ -220,6 +222,7 @@ jobs:
             ./scripts/pipeline/scheduled_backup.sh "${prod_cf_space}"
       - run:
           name: "Run backup"
+          no_output_timeout: 30m
           command: |
             echo "I am the result of Run Backup failed job"
             export BACKUP_ENV=${CIRCLE_BRANCH}
@@ -315,22 +318,40 @@ workflows:
                 - stage
           requires:
             - deploy
-      - post-deploy-upkeep:
+      - post-deploy-upkeep-approval:
           filters:
             branches:
               only:
                 - test
                 - dev
                 - stage
+          type: approval
           requires:
             - post-deploy
+      - post-deploy-upkeep:
+          filters:
+            branches:
+              only:
+                - test
+                - dev
+                - stage
+          requires:
+            - post-deploy-upkeep-approval
+      - cypress-approval:
+          filters:
+            branches:
+              only:
+                - stage
+          type: approval
+          requires:
+            - post-deploy-upkeep
       - cypress:
           filters:
             branches:
               only:
                 - stage
           requires:
-            -  post-deploy-upkeep
+            - cypress-approval
   deploy-prod-workflow:
     when:
       and:
@@ -348,9 +369,13 @@ workflows:
       - post-deploy:
           requires:
             - deploy
-      - post-deploy-upkeep:
+      - post-deploy-upkeep-approval:
+          type: approval
           requires:
             - post-deploy
+      - post-deploy-upkeep:
+          requires:
+            - post-deploy-upkeep-approval
   upkeep-workflow:
     when:
       and:
@@ -390,4 +415,4 @@ workflows:
           - equal: [ test, << pipeline.parameters.restore >> ]
     jobs:
       - downsync
-      
+