Add postgres to CI

This commit is contained in:
Morris Jobke 2016-06-21 15:41:29 +02:00
parent 097cba8b38
commit 6583a2fef0
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 15 additions and 1 deletions

View File

@ -17,7 +17,19 @@ build:
- git submodule update --init - git submodule update --init
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
- ./autotest.sh sqlite - ./autotest.sh sqlite
postgres:
image: morrisjobke/nextcloud-ci-php7:1.0
commands:
- sleep 10 # gives the database enough time to initialize
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- git submodule update --init
- ./autotest.sh pgsql
compose: compose:
cache: cache:
image: redis image: redis
postgres:
image: postgres
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_PASSWORD=oc_autotest

View File

@ -253,7 +253,9 @@ function execute_tests {
echo "Postgres is up." echo "Postgres is up."
else else
dropdb -U "$DATABASEUSER" "$DATABASENAME" || true if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI
dropdb -U "$DATABASEUSER" "$DATABASENAME" || true
fi
fi fi
fi fi
if [ "$DB" == "oci" ] ; then if [ "$DB" == "oci" ] ; then