diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:36:09 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:41:18 +0100 |
| commit | e4f8e12a1696598f22513d1f4a94b5aa2a4b348a (patch) | |
| tree | 0f88706defe95ee7fcf2c84f9c745ae09bb7545f /docker/scripts/runtests.sh | |
| parent | f75de36e911ac72b3325e1074a627f067cc61fd1 (diff) | |
| download | bugzilla-e4f8e12a1696598f22513d1f4a94b5aa2a4b348a.tar.gz bugzilla-e4f8e12a1696598f22513d1f4a94b5aa2a4b348a.tar.xz | |
Revert "Bug 1224649 - Docker and QA scripts should just use the same checksetup_answers.txt file"
This reverts commit 27dac6e9b0d2df69037cd022e77a9bf356fc7a67.
Diffstat (limited to 'docker/scripts/runtests.sh')
| -rwxr-xr-x | docker/scripts/runtests.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/docker/scripts/runtests.sh b/docker/scripts/runtests.sh index 5ad67f6ae..a2b5773b8 100755 --- a/docker/scripts/runtests.sh +++ b/docker/scripts/runtests.sh @@ -1,13 +1,9 @@ #!/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=/scripts/buildbot_step +BUILDBOT=$BUGZILLA_ROOT/docker/scripts/buildbot_step if [ -z "$TEST_SUITE" ]; then TEST_SUITE=sanity @@ -29,7 +25,7 @@ if [ "$GITHUB_BASE_REV" != "" ]; then fi echo -e "\n== Checking dependencies for changes" -bash /scripts/install_deps.sh +$BUGZILLA_ROOT/docker/scripts/install_deps.sh if [ "$TEST_SUITE" = "sanity" ]; then $BUILDBOT "Sanity" prove -f -v t/*.t @@ -54,13 +50,11 @@ echo -e "\n== Starting memcached" sleep 3 echo -e "\n== Running checksetup" -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 +perl checksetup.pl $BUGZILLA_ROOT/qa/config/checksetup_answers.txt +perl checksetup.pl $BUGZILLA_ROOT/qa/config/checksetup_answers.txt echo -e "\n== Generating bmo data" -perl /scripts/generate_bmo_data.pl +perl $BUGZILLA_ROOT/docker/scripts/generate_bmo_data.pl echo -e "\n== Generating test data" cd $BUGZILLA_ROOT/qa/config |