mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15579 from owncloud/autotest-docker-postgres 

autotest.sh with docker support for postgres
This commit is contained in:
Thomas Müller 2015-07-07 15:00:55 +02:00
parent d3e26a3127 5133a738e1
commit 76b399d923
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
autotest.sh
View File

@ -145,8 +145,21 @@ function execute_tests {
mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
fi fi
if [ "$1" == "pgsql" ] ; then if [ "$1" == "pgsql" ] ; then
if [ ! -z "$USEDOCKER" ] ; then
echo "Fire up the postgres docker"
DOCKER_CONTAINER_ID=$(docker run -e POSTGRES_USER="$DATABASEUSER" -e POSTGRES_PASSWORD=owncloud -d postgres)
DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4)
echo "Waiting for Postgres initialisation ..."
# grep exits on the first match and then the script continues
docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "database system is ready to accept connections"
echo "Postgres is up."
else
dropdb -U "$DATABASEUSER" "$DATABASENAME" || true dropdb -U "$DATABASEUSER" "$DATABASENAME" || true
fi fi
fi
if [ "$1" == "oci" ] ; then if [ "$1" == "oci" ] ; then
echo "Fire up the oracle docker" echo "Fire up the oracle docker"
DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g) DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g)
@ -177,6 +190,12 @@ function execute_tests {
"${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3" "${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3"
RESULT=$? RESULT=$?
fi fi
if [ ! -z "$DOCKER_CONTAINER_ID" ] ; then
echo "Kill the docker $DOCKER_CONTAINER_ID"
docker rm -f $DOCKER_CONTAINER_ID
unset DOCKER_CONTAINER_ID
fi
} }
# #