diff --git a/.circleci/config.yml b/.circleci/config.yml index 845b19fbe..fca5b843c 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ workflows: - main - master - /^release.*/ - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE circle-ci-setup: jobs: - setup: @@ -84,5 +84,5 @@ workflows: - main - master - /^release.*/ - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE diff --git a/.circleci/deployment/jobs.yml b/.circleci/deployment/jobs.yml index f146e251d..9e5557629 100644 --- a/.circleci/deployment/jobs.yml +++ b/.circleci/deployment/jobs.yml @@ -12,7 +12,6 @@ - deploy-cloud-dot-gov: backend-appname: tdp-backend-<< parameters.target_env >> frontend-appname: tdp-frontend-<< parameters.target_env >> - deploy-staging: executor: docker-executor diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml index 0cf80e2c7..66d68b882 100644 --- a/.circleci/deployment/workflows.yml +++ b/.circleci/deployment/workflows.yml @@ -6,7 +6,7 @@ - equal: [ master, << pipeline.git.branch >> ] - equal: [ main, << pipeline.git.branch >> ] - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ '2722/circleci', << pipeline.git.branch >> ] #DELETE BEFORE MERGE + # - equal: [ '2722/circleci', << pipeline.git.branch >> ] #DELETE BEFORE MERGE - << pipeline.parameters.run_dev_deployment >> - not: << pipeline.parameters.run_nightly_owasp_scan >> @@ -22,7 +22,7 @@ filters: branches: ignore: - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE - develop - main - master @@ -30,7 +30,7 @@ filters: branches: only: - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE - develop - main - deploy-infrastructure-production: @@ -57,7 +57,7 @@ filters: branches: only: - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE - develop - enable-versioning: requires: @@ -95,7 +95,7 @@ filters: branches: ignore: - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE - develop - main - master @@ -105,7 +105,7 @@ filters: branches: only: - - '2722/circleci' #DELETE BEFORE MERGE + # - '2722/circleci' #DELETE BEFORE MERGE - develop - deploy-staging: requires: