Merge pull request #1205 from dod-ccpo/cd-workflow-fixes

Do not run test workflow for merges to main branches.

.circleci/config.yml

@@ -285,7 +285,12 @@ workflows:
   version: 2
   run-tests:
     jobs:
-      - docker-build-staging
+      - docker-build-staging:
+          filters:
+            branches:
+              ignore:
+                - staging
+                - master
       - test:
           requires:
             - docker-build-staging

deploy/azure/atst-envvars-configmap.yml

@@ -10,7 +10,7 @@ data:
   CELERY_DEFAULT_QUEUE: celery-master
   CDN_ORIGIN: https://azure.atat.code.mil
   CSP: azure
-  FLASK_ENV: dev
+  FLASK_ENV: master
   LOG_JSON: "true"
   OVERRIDE_CONFIG_FULLPATH: /opt/atat/atst/atst-overrides.ini
   PGSSLMODE: verify-full