diff options
Diffstat (limited to 'docker_files')
| -rwxr-xr-x | docker_files/runtests.sh | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/docker_files/runtests.sh b/docker_files/runtests.sh index c15dca9ee..04152189f 100755 --- a/docker_files/runtests.sh +++ b/docker_files/runtests.sh @@ -41,11 +41,6 @@ if [ "$TEST_SUITE" = "docs" ]; then exit $? fi -echo -e "\n== Cloning QA test suite" -cd $BUGZILLA_ROOT -echo "Cloning git repo $GITHUB_QA_GIT branch $GITHUB_BASE_BRANCH ..." -git clone $GITHUB_QA_GIT -b $GITHUB_BASE_BRANCH qa - echo -e "\n== Starting database" /usr/bin/mysqld_safe & sleep 3 @@ -55,32 +50,24 @@ echo -e "\n== Starting memcached" sleep 3 echo -e "\n== Updating configuration" -sed -e "s?%DB%?$BUGS_DB_DRIVER?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%DB_NAME%?bugs_test?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%USER%?$USER?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%TRAVIS_BUILD_DIR%?$BUGZILLA_ROOT?g" --in-place qa/config/selenium_test.conf -echo "\$answer{'memcached_servers'} = 'localhost:11211';" >> qa/config/checksetup_answers.txt - -if [ "$TEST_SUITE" == "checksetup" ]; then - cd $BUGZILLA_ROOT/qa - /bin/bash /docker_files/buildbot_step "Checksetup" ./test_checksetup.pl config/config-checksetup-$BUGS_DB_DRIVER - exit $? -fi +sed -e "s?%DB%?$BUGS_DB_DRIVER?g" --in-place xt/config/checksetup_answers.txt +echo "\$answer{'memcached_servers'} = 'localhost:11211';" >> xt/config/checksetup_answers.txt echo -e "\n== Running checksetup" cd $BUGZILLA_ROOT -./checksetup.pl qa/config/checksetup_answers.txt -./checksetup.pl qa/config/checksetup_answers.txt +./checksetup.pl xt/config/checksetup_answers.txt +./checksetup.pl xt/config/checksetup_answers.txt echo -e "\n== Generating test data" -cd $BUGZILLA_ROOT/qa/config -perl -I../../local/lib/perl5 generate_test_data.pl +cd $BUGZILLA_ROOT/xt/config +perl generate_test_data.pl echo -e "\n== Starting web server" sed -e "s?^#Perl?Perl?" --in-place /etc/httpd/conf.d/bugzilla.conf /usr/sbin/httpd & sleep 3 +cd $BUGZILLA_ROOT if [ "$TEST_SUITE" = "selenium" ]; then export DISPLAY=:0 @@ -100,13 +87,11 @@ if [ "$TEST_SUITE" = "selenium" ]; then # but no tests actually executed. [ $NO_TESTS ] && exit 0 - cd $BUGZILLA_ROOT/qa/t - /bin/bash /docker_files/buildbot_step "Selenium" prove -f -v -I$BUGZILLA_ROOT/lib test_*.t + /bin/bash /docker_files/buildbot_step "Selenium" prove -f -v xt/selenium/*.t exit $? fi if [ "$TEST_SUITE" = "webservices" ]; then - cd $BUGZILLA_ROOT/qa/t - /bin/bash /docker_files/buildbot_step "Webservices" prove -f -v -I$BUGZILLA_ROOT/lib {rest,webservice}_*.t + /bin/bash /docker_files/buildbot_step "Webservices" prove -f -v xt/{rest,webservice}/*.t exit $? fi |