diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-11-27 17:59:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 17:59:15 +0100 |
| commit | aa8e455c9735d5a7ea4703dba3f22a69e07b9698 (patch) | |
| tree | bf9b9c454946e248593f7a39528d3f9a4cb079bd /.circleci | |
| parent | 6c437576ffbec1a3f7296302f8594f89653992dd (diff) | |
| download | bugzilla-aa8e455c9735d5a7ea4703dba3f22a69e07b9698.tar.gz bugzilla-aa8e455c9735d5a7ea4703dba3f22a69e07b9698.tar.xz | |
no bug - tweaks for conduit/phabricator dev environments
* tweak
* change around unsafe auth delegation to work in bmo container
* fixes for critic errors
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/checksetup_answers.txt | 3 | ||||
| -rw-r--r-- | .circleci/config.yml | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.circleci/checksetup_answers.txt b/.circleci/checksetup_answers.txt index 8178854ac..d75fcc5dc 100644 --- a/.circleci/checksetup_answers.txt +++ b/.circleci/checksetup_answers.txt @@ -9,5 +9,6 @@ $answer{'cvsbin'} = '/usr/bin/cvs'; $answer{'password_complexity'} = 'bmo'; $answer{'diffpath'} = '/usr/bin'; $answer{'interdiffbin'} = '/usr/bin/interdiff'; -$answer{'urlbase'} = 'http://<<HOSTNAME>>:8000/'; +$answer{'urlbase'} = 'http://bmo.test/'; $answer{'mail_delivery_method'} = 'Test'; +$answer{'auth_delegation'} = 1; diff --git a/.circleci/config.yml b/.circleci/config.yml index f13b10a58..0b2071a37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,8 +54,8 @@ defaults: run: command: | mv /opt/bmo/local /app/local - perl -MSys::Hostname -i -pE 's/<<HOSTNAME>>/hostname()/ges' $BZ_QA_CONF_FILE - perl -MSys::Hostname -i -pE 's/<<HOSTNAME>>/hostname()/ges' $BZ_QA_ANSWERS_FILE + perl -MSys::Hostname -i -pE 's/bmo.test/hostname().":8000"/ges' $BZ_QA_CONF_FILE + perl -MSys::Hostname -i -pE 's/bmo.test/hostname().":8000"/ges' $BZ_QA_ANSWERS_FILE perl checksetup.pl --no-database --default-localconfig mkdir artifacts @@ -159,7 +159,7 @@ jobs: - run: | mv /opt/bmo/local /app/local perl checksetup.pl --no-database - perl -MSys::Hostname -i -pE 's/<<HOSTNAME>>/hostname()/ges' $BZ_QA_ANSWERS_FILE + perl -MSys::Hostname -i -pE 's/bmo.test/hostname().":8000"/ges' $BZ_QA_ANSWERS_FILE /app/scripts/entrypoint.pl load_test_data mkdir artifacts - run: | |