diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-14 10:03:14 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-14 14:02:16 +0300 |
| commit | 239ff34f3def73a9bf8f1ead9f868e9859a60984 (patch) | |
| tree | b1ce02a261b2c6bf1d13308fb5a5e239823acffc | |
| parent | b9d7c48acf12d438b607d0e4214e6083ecc11fc5 (diff) | |
Fix drone
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | .drone.yml | 3 | ||||
| -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, 15 insertions, 9 deletions
diff --git a/.drone.yml b/.drone.yml index 11458a30398..0dc96e84d5e 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 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, ], |