Fix docker image naming issue for CI

* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
This commit is contained in:
Morris Jobke 2016-07-06 11:27:35 +02:00
parent fcf25864d6
commit cb69571cda
1 changed files with 12 additions and 11 deletions

View File

@ -1,36 +1,37 @@
build: 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: jsunit:
image: morrisjobke/nextcloud-ci-jsunit:1.0.2 image: nextcloudci/jsunit:1.0.6
commands: commands:
- ./autotest-js.sh - ./autotest-js.sh
sqlite: sqlite:
image: morrisjobke/nextcloud-ci-php7:1.0 image: nextcloudci/php5.6:1.0.6
commands: commands:
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- 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
mysql: mysql:
image: morrisjobke/nextcloud-ci-php7:1.0.4 image: nextcloudci/php5.6:1.0.6
commands: commands:
- sleep 15 # gives the database enough time to initialize - sleep 15 # gives the database enough time to initialize
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- git submodule update --init - git submodule update --init
- ./autotest.sh mysql - ./autotest.sh mysql
postgres: postgres:
image: morrisjobke/nextcloud-ci-php7:1.0 image: nextcloudci/php5.6:1.0.6
commands: commands:
- sleep 10 # gives the database enough time to initialize - sleep 10 # gives the database enough time to initialize
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- git submodule update --init - git submodule update --init
- ./autotest.sh pgsql - ./autotest.sh pgsql
integration:
image: nextcloudci/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: compose:
cache: cache: