aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-18 12:40:17 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-10-19 00:15:01 +0200
commitb1235a67de9589457af91dfc322d7853199547b0 (patch)
treed41b220dd8d3efd5a4006537c83f55817fedf931
parent64c9ef96c4a8b205e32cdc1a38038aef18dcf4cf (diff)
downloadnextcloud-server-b1235a67de9589457af91dfc322d7853199547b0.tar.gz
nextcloud-server-b1235a67de9589457af91dfc322d7853199547b0.zip
test alternative drone syntax for command options
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--.drone.yml3
-rwxr-xr-xautotest.sh5
2 files changed, 5 insertions, 3 deletions
diff --git a/.drone.yml b/.drone.yml
index 025d223f2d1..78cdefd82b4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -407,8 +407,7 @@ services:
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
- volumes:
- - /drone/src/github.com/nextcloud/server/tests/docker/mysqlmb4:/etc/mysql/conf.d
+ command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
when:
matrix:
DB: mysqlmb4
diff --git a/autotest.sh b/autotest.sh
index c77562e7602..61e7426ab99 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -218,7 +218,10 @@ function execute_tests {
-e MYSQL_USER="$DATABASEUSER" \
-e MYSQL_PASSWORD=owncloud \
-e MYSQL_DATABASE="$DATABASENAME" \
- -d mysql:5.7)
+ -d mysql:5.7
+ --innodb_large_prefix=true
+ --innodb_file_format=barracuda
+ --innodb_file_per_table=true)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")