pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Do not run test workflow for merges to main branches.
This commit is contained in:
dandds 2019-11-22 13:12:54 -05:00 committed by GitHub
commit 1ec0352c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

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

2
deploy/azure/atst-envvars-configmap.yml
View File

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