diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-06 11:27:35 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-07-06 15:05:27 +0200 |
| commit | 024919b9dee06d5528c4719ea1aca7fefaffe01c (patch) | |
| tree | 6c07d2476bc21ef3a2264891273c3307f9a98697 /.drone.yml | |
| parent | 6d9809ef452d73b53d3d70493d9a92ee64bd528f (diff) | |
| download | nextcloud-server-024919b9dee06d5528c4719ea1aca7fefaffe01c.tar.gz nextcloud-server-024919b9dee06d5528c4719ea1aca7fefaffe01c.zip | |
Fix docker image naming issue for CI
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
Diffstat (limited to '.drone.yml')
| -rw-r--r-- | .drone.yml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/.drone.yml b/.drone.yml index 4d0a0aba2a8..f485044f72f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,29 +1,30 @@ 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 + image: nextcloudci/jsunit:1.0.6 commands: - ./autotest-js.sh sqlite: - image: morrisjobke/nextcloud-ci-php7:1.0 + 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 --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite postgres: - image: morrisjobke/nextcloud-ci-php7:1.0 + image: nextcloudci/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: 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: cache: |