diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-14 23:34:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 23:34:12 +0200 |
| commit | 81d785b6800cf6509727bc52d8a5f8cb52637bb2 (patch) | |
| tree | 03fcf4e3e9d72d1bb81f61689ca381c3b3abed7c | |
| parent | b9d7c48acf12d438b607d0e4214e6083ecc11fc5 (diff) | |
| parent | d61fc0531f747fffa771b974f3feeee3cb58ecab (diff) | |
| download | nextcloud-server-81d785b6800cf6509727bc52d8a5f8cb52637bb2.tar.gz nextcloud-server-81d785b6800cf6509727bc52d8a5f8cb52637bb2.zip | |
Merge pull request #5730 from nextcloud/stable12-fix-drone
[stable12] fix drone for 0.7
| -rw-r--r-- | .drone.yml | 23 | ||||
| -rwxr-xr-x | autotest.sh | 7 | ||||
| -rw-r--r-- | tests/redis-cluster.config.php | 12 | ||||
| -rw-r--r-- | tests/redis.config.php | 2 |
4 files changed, 25 insertions, 19 deletions
diff --git a/.drone.yml b/.drone.yml index 11458a30398..d0b44b28262 100644 --- a/.drone.yml +++ b/.drone.yml @@ -247,6 +247,9 @@ pipeline: image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin + - ./occ config:system:set redis host --value=cache + - ./occ config:system:set redis port --value=6379 --type=integer + - ./occ config:system:set redis timeout --value=0 --type=integer - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed - ./occ app:enable testing @@ -561,12 +564,12 @@ matrix: - TESTS: integration-transfer-ownership-features - TESTS: integration-ldap-features - TESTS: integration-trashbin - - TESTS: acceptance - TESTS-ACCEPTANCE: access-levels - - TESTS: acceptance - TESTS-ACCEPTANCE: app-files - - TESTS: acceptance - TESTS-ACCEPTANCE: login +# - TESTS: acceptance +# TESTS-ACCEPTANCE: access-levels +# - TESTS: acceptance +# TESTS-ACCEPTANCE: app-files +# - TESTS: acceptance +# TESTS-ACCEPTANCE: login - TESTS: jsunit - TESTS: syntax-php5.6 - TESTS: syntax-php7.0 @@ -577,13 +580,13 @@ matrix: - TESTS: caldavtester-new-endpoint - TESTS: carddavtester-new-endpoint - TESTS: carddavtester-old-endpoint - - TESTS: object-store - OBJECT_STORE: s3 +# - TESTS: object-store +# OBJECT_STORE: s3 - TESTS: sqlite-php7.0-samba-native - TESTS: sqlite-php7.0-samba-non-native - TEST: memcache-memcached - - TEST: memcache-redis-cluster - ENABLE_REDIS_CLUSTER: true +# - TEST: memcache-redis-cluster +# ENABLE_REDIS_CLUSTER: true - TESTS: sqlite-php7.0-webdav-apache ENABLE_REDIS: true - DB: NODB diff --git a/autotest.sh b/autotest.sh index 069488a3346..307af64edb7 100755 --- a/autotest.sh +++ b/autotest.sh @@ -212,7 +212,7 @@ function execute_tests { fi mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true else - DATABASEHOST=127.0.0.1 + DATABASEHOST=mysql fi fi echo "Waiting for MySQL initialisation ..." @@ -246,7 +246,7 @@ function execute_tests { fi mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true else - DATABASEHOST=127.0.0.1 + DATABASEHOST=mysqlmb4 fi fi @@ -308,6 +308,9 @@ function execute_tests { echo "Postgres is up." else + if [ ! -z "$DRONE" ] ; then + DATABASEHOST=postgres + fi echo "Waiting for Postgres to be available ..." if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then echo "[ERROR] Waited 60 seconds, no response" >&2 diff --git a/tests/redis-cluster.config.php b/tests/redis-cluster.config.php index c7df2a91854..e255d123f60 100644 --- a/tests/redis-cluster.config.php +++ b/tests/redis-cluster.config.php @@ -6,12 +6,12 @@ $CONFIG = [ 'memcache.locking' => '\\OC\\Memcache\\Redis', 'redis.cluster' => [ 'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required - 'localhost:7000', - 'localhost:7001', - 'localhost:7002', - 'localhost:7003', - 'localhost:7004', - 'localhost:7005' + 'cache-cluster:7000', + 'cache-cluster:7001', + 'cache-cluster:7002', + 'cache-cluster:7003', + 'cache-cluster:7004', + 'cache-cluster:7005' ], 'timeout' => 0.0, 'read_timeout' => 0.0, diff --git a/tests/redis.config.php b/tests/redis.config.php index 2ff46ec6728..9d3f1eca63e 100644 --- a/tests/redis.config.php +++ b/tests/redis.config.php @@ -5,7 +5,7 @@ $CONFIG = [ 'memcache.distributed' => '\\OC\\Memcache\\Redis', 'memcache.locking' => '\\OC\\Memcache\\Redis', 'redis' => [ - 'host' => 'localhost', + 'host' => 'cache', 'port' => 6379, 'timeout' => 0, ], |