Skip to content

Commit

Permalink
Fix docker image naming issue for CI
Browse files Browse the repository at this point in the history
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
* adds also MySQL tests
  • Loading branch information
MorrisJobke committed Jul 6, 2016
1 parent 6d9809e commit a441efb
Showing 1 changed file with 24 additions and 9 deletions.
33 changes: 24 additions & 9 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
build:
integration:
image: morrisjobke/nextcloud-ci-php7:1.0.3
commands:
- git submodule update --init
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh
jsunit:
image: morrisjobke/nextcloud-ci-jsunit:1.0.2
commands:
- ./autotest-js.sh
sqlite:
image: morrisjobke/nextcloud-ci-php7:1.0
image: morrisjobke/nextcloud-ci-php5.6:1.0.6
commands:
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- 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=''
- ./autotest.sh sqlite
mysql:
image: morrisjobke/nextcloud-ci-php5.6:1.0.6
commands:
- sleep 15 # 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 mysql
postgres:
image: morrisjobke/nextcloud-ci-php7:1.0
image: morrisjobke/nextcloud-ci-php5.6:1.0.6
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
integration:
image: morrisjobke/nextcloud-ci-php5.6:1.0.6
commands:
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- git submodule update --init
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh

compose:
cache:
Expand All @@ -33,3 +41,10 @@ compose:
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_PASSWORD=oc_autotest
mysql:
image: mysql
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest

0 comments on commit a441efb

Please sign in to comment.