From d4144535275d1e1bee22c51f3df7d1c41cdb6969 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 3 Feb 2016 09:05:24 +0100 Subject: [PATCH] Fix reporting --- docker/scripts/db/mysql.sh | 2 -- docker/scripts/jobs/unit-tests.sh | 15 --------------- docker/scripts/utils/set-result-status.sh | 6 +++--- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/docker/scripts/db/mysql.sh b/docker/scripts/db/mysql.sh index 4e0d2d335a..fb0a26a849 100644 --- a/docker/scripts/db/mysql.sh +++ b/docker/scripts/db/mysql.sh @@ -29,6 +29,4 @@ EOL mysql docker run --rm --link mysql:mysql waisbrot/wait - - echo 'Mysql UP' } diff --git a/docker/scripts/jobs/unit-tests.sh b/docker/scripts/jobs/unit-tests.sh index 67dda17bbd..728de53143 100755 --- a/docker/scripts/jobs/unit-tests.sh +++ b/docker/scripts/jobs/unit-tests.sh @@ -9,21 +9,6 @@ php=$2 start_db -echo docker run \ - --user $(id -u):$(id -g) \ - ${DOCKER_LINK} \ - --env PHPBB_TEST_DBMS="${PHPBB_TEST_DBMS}" \ - --env PHPBB_TEST_DBHOST="${PHPBB_TEST_DBHOST}" \ - --env PHPBB_TEST_DBPORT="${PHPBB_TEST_DBPORT}" \ - --env PHPBB_TEST_DBNAME="${PHPBB_TEST_DBNAME}" \ - --env PHPBB_TEST_DBUSER="${PHPBB_TEST_DBUSER}" \ - --env PHPBB_TEST_DBPASSWD="${PHPBB_TEST_DBPASSWD}" \ - --env PHPBB_TEST_TABLE_PREFIX="${PHPBB_TEST_TABLE_PREFIX}" \ - --volume ${WORKING_DIR}:/data \ - --workdir /data \ - phpbb/php-ut-${php}-${db} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml - - docker run \ --user $(id -u):$(id -g) \ ${DOCKER_LINK} \ diff --git a/docker/scripts/utils/set-result-status.sh b/docker/scripts/utils/set-result-status.sh index 7c685fa6a2..37af03cf94 100755 --- a/docker/scripts/utils/set-result-status.sh +++ b/docker/scripts/utils/set-result-status.sh @@ -13,11 +13,11 @@ fi if [ $res -eq 0 ]; then echo Send success - $(dirname "$0")/set-status.sh 'success' 'The Bamboo build is a success' ${step} + $(dirname "$0")/set-status.sh 'success' 'The Bamboo build is a success' "${step}" elif [ $res -eq 1 ]; then echo Send Failure - $(dirname "$0")/set-status.sh 'failure' 'The Bamboo build failed' ${step} + $(dirname "$0")/set-status.sh 'failure' 'The Bamboo build failed' "${step}" else echo Send error - $(dirname "$0")/set-status.sh 'error' 'The Bamboo build is in error' ${step} + $(dirname "$0")/set-status.sh 'error' 'The Bamboo build is in error' "${step}" fi