summaryrefslogtreecommitdiffstats
path: root/.circleci
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-10-07 00:11:25 +0200
committerGitHub <noreply@github.com>2017-10-07 00:11:25 +0200
commitbbfe30297f0a56d4d384f60e0ff20e7c67e08d7a (patch)
treeb2f34eca75df83ecc1f8da1f5d59184bcad242b0 /.circleci
parent6fe0afaa39271bbd75cf068abd67b19fd062a843 (diff)
downloadbugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.gz
bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.xz
Bug 1404092 - Bugzilla->localconfig should directly use environmental variables and ignore the localconfig file
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml18
1 files changed, 8 insertions, 10 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 966ad1c9c..de289a3c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,7 @@ defaults:
bmo_env: &bmo_env
PORT: 8000
+ LOCALCONFIG_ENV: 1
BMO_db_user: bugs
BMO_db_host: 127.0.0.1
BMO_db_pass: bugs
@@ -95,7 +96,6 @@ jobs:
- run:
name: run sanity tests
command: |
- rm /app/localconfig
/app/scripts/entrypoint.pl prove -qf $(circleci tests glob 't/*.t' | circleci tests split) | tee artifacts/$CIRCLE_JOB.txt
- store_artifacts:
path: /app/artifacts
@@ -108,14 +108,14 @@ jobs:
- checkout
- *default_qa_setup
- run: |
- rm -f /app/localconfig
/app/scripts/entrypoint.pl load_test_data
- run:
command: |
- rm -f /app/localconfig
/app/scripts/entrypoint.pl test_webservices | tee artifacts/$CIRCLE_JOB.txt
- store_artifacts:
path: /app/artifacts
+ - store_artifacts:
+ path: /app/logs
test_selenium:
parallelism: 1
@@ -125,14 +125,14 @@ jobs:
- checkout
- *default_qa_setup
- run: |
- rm -f /app/localconfig
/app/scripts/entrypoint.pl load_test_data --legacy
- run:
command: |
- rm -f /app/localconfig
/app/scripts/entrypoint.pl test_selenium | tee artifacts/$CIRCLE_JOB.txt
- store_artifacts:
path: /app/artifacts
+ - store_artifacts:
+ path: /app/logs
test_bmo:
parallelism: 1
@@ -153,18 +153,16 @@ jobs:
- checkout
- run: |
mv /opt/bmo/local /app/local
- perl checksetup.pl --no-database --default-localconfig
+ perl checksetup.pl --no-database
perl -MSys::Hostname -i -pE 's/<<HOSTNAME>>/hostname()/ges' $BZ_QA_ANSWERS_FILE
- rm -f /app/localconfig
/app/scripts/entrypoint.pl load_test_data
mkdir artifacts
- run: |
BZ_BASE_URL="http://$(hostname):$PORT"
export BZ_BASE_URL
- rm -f /app/localconfig
/app/scripts/entrypoint.pl test_bmo -q -f t/bmo/*.t
-
-
+ - store_artifacts:
+ path: /app/logs
workflows:
version: 2