From 094836580927c99d0e38eb81c4af1128fe6dec15 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 28 Jul 2017 09:20:28 +0200 Subject: [PATCH 1/2] Update all drone images to latest version Signed-off-by: Morris Jobke --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index fc14ba7a36..26beb5586c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ pipeline: matrix: TESTS: jsunit checkers: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - ./autotest-checkers.sh when: @@ -154,7 +154,7 @@ pipeline: DB: NODB PHP: 5.6 nodb-php7.0: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite when: @@ -178,7 +178,7 @@ pipeline: DB: sqlite PHP: 5.6 sqlite-php7.0: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite when: @@ -489,7 +489,7 @@ pipeline: matrix: TESTS-ACCEPTANCE: login nodb-codecov: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - TEST_SELECTION=NODB ./autotest.sh sqlite - wget https://codecov.io/bash -O codecov.sh @@ -499,7 +499,7 @@ pipeline: matrix: TESTS: nodb-codecov db-codecov: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - TEST_SELECTION=QUICKDB ./autotest.sh sqlite - wget https://codecov.io/bash -O codecov.sh @@ -509,7 +509,7 @@ pipeline: matrix: TESTS: db-codecov object-store: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - TEST_SELECTION=PRIMARY-${OBJECT_STORE} ./autotest.sh sqlite - wget https://codecov.io/bash -O codecov.sh @@ -530,7 +530,7 @@ pipeline: matrix: TEST: memcache-memcached memcache-redis-cluster: - image: nextcloudci/php7.0:php7.0-7 + image: nextcloudci/php7.0:php7.0-13 commands: - sleep 10 - ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php From c85b7e6ae34f4b297cfc9298697449cfe66e4482 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 28 Jul 2017 09:21:24 +0200 Subject: [PATCH 2/2] Move all DB tests to top, because they are long running Signed-off-by: Morris Jobke --- .drone.yml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 26beb5586c..8630b0ebb2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -547,6 +547,33 @@ matrix: ENABLE_REDIS: true - TESTS: db-codecov ENABLE_REDIS: true + - DB: NODB + PHP: 5.6 + ENABLE_REDIS: true + - DB: NODB + PHP: 7.0 + ENABLE_REDIS: true + - DB: NODB + PHP: 7.1 + ENABLE_REDIS: true + - DB: sqlite + PHP: 5.6 + ENABLE_REDIS: true + - DB: sqlite + PHP: 7.0 + ENABLE_REDIS: true + - DB: sqlite + PHP: 7.1 + ENABLE_REDIS: true + - DB: mysql + PHP: 5.6 + ENABLE_REDIS: true + - DB: postgres + PHP: 5.6 + ENABLE_REDIS: true + - DB: mysqlmb4 + PHP: 5.6 + ENABLE_REDIS: true - TESTS: integration-capabilities_features - TESTS: integration-federation_features - TESTS: integration-maintenance-mode @@ -601,33 +628,6 @@ matrix: # ENABLE_REDIS_CLUSTER: true - TESTS: sqlite-php7.0-webdav-apache ENABLE_REDIS: true - - DB: NODB - PHP: 5.6 - ENABLE_REDIS: true - - DB: NODB - PHP: 7.0 - ENABLE_REDIS: true - - DB: NODB - PHP: 7.1 - ENABLE_REDIS: true - - DB: sqlite - PHP: 5.6 - ENABLE_REDIS: true - - DB: sqlite - PHP: 7.0 - ENABLE_REDIS: true - - DB: sqlite - PHP: 7.1 - ENABLE_REDIS: true - - DB: mysql - PHP: 5.6 - ENABLE_REDIS: true - - DB: postgres - PHP: 5.6 - ENABLE_REDIS: true - - DB: mysqlmb4 - PHP: 5.6 - ENABLE_REDIS: true services: cache: