Skip to content

Commit b255694

Browse files
committed
Fix docker image naming issue for CI
* wrongly named PHP7 - it is PHP 5.6 * moved integration tests at the very end * adds also MySQL tests
1 parent 6d9809e commit b255694

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

.drone.yml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
11
build:
2-
integration:
3-
image: morrisjobke/nextcloud-ci-php7:1.0.3
4-
commands:
5-
- git submodule update --init
6-
- ./occ maintenance:install --admin-pass=admin
7-
- cd build/integration
8-
- ./run.sh
92
jsunit:
10-
image: morrisjobke/nextcloud-ci-jsunit:1.0.2
3+
image: nextcloudci/jsunit:1.0.6
114
commands:
125
- ./autotest-js.sh
136
sqlite:
14-
image: morrisjobke/nextcloud-ci-php7:1.0
7+
image: nextcloudci/php5.6:1.0.6
158
commands:
169
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
1710
- git submodule update --init
1811
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
1912
- ./autotest.sh sqlite
13+
mysql:
14+
image: nextcloudci/php5.6:1.0.6
15+
commands:
16+
- sleep 15 # gives the database enough time to initialize
17+
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
18+
- git submodule update --init
19+
- ./autotest.sh mysql
2020
postgres:
21-
image: morrisjobke/nextcloud-ci-php7:1.0
21+
image: nextcloudci/php5.6:1.0.6
2222
commands:
2323
- sleep 10 # gives the database enough time to initialize
2424
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
2525
- git submodule update --init
2626
- ./autotest.sh pgsql
27+
integration:
28+
image: nextcloudci/php5.6:1.0.6
29+
commands:
30+
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
31+
- git submodule update --init
32+
- ./occ maintenance:install --admin-pass=admin
33+
- cd build/integration
34+
- ./run.sh
2735

2836
compose:
2937
cache:
@@ -33,3 +41,10 @@ compose:
3341
environment:
3442
- POSTGRES_USER=oc_autotest
3543
- POSTGRES_PASSWORD=oc_autotest
44+
mysql:
45+
image: mysql
46+
environment:
47+
- MYSQL_ROOT_PASSWORD=owncloud
48+
- MYSQL_USER=oc_autotest
49+
- MYSQL_PASSWORD=owncloud
50+
- MYSQL_DATABASE=oc_autotest

0 commit comments

Comments
 (0)