diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-11-14 18:03:49 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-11-14 18:03:49 +0100 |
| commit | 27dac6e9b0d2df69037cd022e77a9bf356fc7a67 (patch) | |
| tree | 00d86c1b27138ce26cb60e3e342d001e9b1fa800 /docker/scripts/runtests.sh | |
| parent | 47f649124510a3e91a315fc7c7cd07286f36e91a (diff) | |
| download | bugzilla-27dac6e9b0d2df69037cd022e77a9bf356fc7a67.tar.gz bugzilla-27dac6e9b0d2df69037cd022e77a9bf356fc7a67.tar.xz | |
Bug 1224649 - Docker and QA scripts should just use the same checksetup_answers.txt file
Diffstat (limited to 'docker/scripts/runtests.sh')
| -rwxr-xr-x | docker/scripts/runtests.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/docker/scripts/runtests.sh b/docker/scripts/runtests.sh index a2b5773b8..5ad67f6ae 100755 --- a/docker/scripts/runtests.sh +++ b/docker/scripts/runtests.sh @@ -1,9 +1,13 @@ #!/bin/bash + # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. -BUILDBOT=$BUGZILLA_ROOT/docker/scripts/buildbot_step +BUILDBOT=/scripts/buildbot_step if [ -z "$TEST_SUITE" ]; then TEST_SUITE=sanity @@ -25,7 +29,7 @@ if [ "$GITHUB_BASE_REV" != "" ]; then fi echo -e "\n== Checking dependencies for changes" -$BUGZILLA_ROOT/docker/scripts/install_deps.sh +bash /scripts/install_deps.sh if [ "$TEST_SUITE" = "sanity" ]; then $BUILDBOT "Sanity" prove -f -v t/*.t @@ -50,11 +54,13 @@ echo -e "\n== Starting memcached" sleep 3 echo -e "\n== Running checksetup" -perl checksetup.pl $BUGZILLA_ROOT/qa/config/checksetup_answers.txt -perl checksetup.pl $BUGZILLA_ROOT/qa/config/checksetup_answers.txt +export DB_ENV_MYSQL_DATABASE="bugs_test" +bash /scripts/checksetup_answers.sh > checksetup_answers.txt +perl checksetup.pl checksetup_answers.txt +perl checksetup.pl checksetup_answers.txt echo -e "\n== Generating bmo data" -perl $BUGZILLA_ROOT/docker/scripts/generate_bmo_data.pl +perl /scripts/generate_bmo_data.pl echo -e "\n== Generating test data" cd $BUGZILLA_ROOT/qa/config |