From 41bab4f594980445dbea617f6dbad1d73527ac18 Mon Sep 17 00:00:00 2001 From: dandds Date: Fri, 22 Nov 2019 12:53:14 -0500 Subject: [PATCH] Do not run test workflow for merges to main branches. We should not run a redundant testing workflow on merges to master or staging. This also includes a quick fix to configure the FLASK_ENV for the main site. --- .circleci/config.yml | 7 ++++++- deploy/azure/atst-envvars-configmap.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1374452f..ff375cd8 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/deploy/azure/atst-envvars-configmap.yml b/deploy/azure/atst-envvars-configmap.yml index bd40ec5e..8dd80237 100644 --- a/deploy/azure/atst-envvars-configmap.yml +++ b/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