summaryrefslogtreecommitdiffstats
path: root/docker_files/runtests.sh
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2016-02-26 16:05:39 +0100
committerDavid Lawrence <dkl@mozilla.com>2016-02-26 16:05:39 +0100
commit6f70920f2d2bb038a371e3cb3debff44f7001fa8 (patch)
tree7deae676cde99def8074a78c207cd2809fc22118 /docker_files/runtests.sh
parentc664718ef5e857144479859546d998f1465b830b (diff)
downloadbugzilla-6f70920f2d2bb038a371e3cb3debff44f7001fa8.tar.gz
bugzilla-6f70920f2d2bb038a371e3cb3debff44f7001fa8.tar.xz
Bug 1250043 - Updated docker config to use new method if installing dependencies (Makefile.PL)
Diffstat (limited to 'docker_files/runtests.sh')
-rwxr-xr-xdocker_files/runtests.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker_files/runtests.sh b/docker_files/runtests.sh
index 37dfcfa7e..c15dca9ee 100755
--- a/docker_files/runtests.sh
+++ b/docker_files/runtests.sh
@@ -17,8 +17,9 @@ exec > >(tee /runtests.log) 2>&1
echo "== Retrieving Bugzilla code"
echo "Checking out $GITHUB_BASE_GIT $GITHUB_BASE_BRANCH ..."
-mv $BUGZILLA_ROOT "${BUGZILLA_ROOT}.back"
+mv $BUGZILLA_ROOT ${BUGZILLA_ROOT}.back
git clone $GITHUB_BASE_GIT --single-branch --depth 1 --branch $GITHUB_BASE_BRANCH $BUGZILLA_ROOT
+rsync -a ${BUGZILLA_ROOT}.back/local/ ${BUGZILLA_ROOT}/local/
cd $BUGZILLA_ROOT
if [ "$GITHUB_BASE_REV" != "" ]; then
echo "Switching to revision $GITHUB_BASE_REV ..."
@@ -73,7 +74,7 @@ cd $BUGZILLA_ROOT
echo -e "\n== Generating test data"
cd $BUGZILLA_ROOT/qa/config
-perl generate_test_data.pl
+perl -I../../local/lib/perl5 generate_test_data.pl
echo -e "\n== Starting web server"
sed -e "s?^#Perl?Perl?" --in-place /etc/httpd/conf.d/bugzilla.conf