Add mariadb 10.0 ci tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 52 insertions, 5 deletions

diff --git a/.drone.yml b/.drone.yml
index 9cc36d301c6..8be64bf5d81 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -397,6 +397,43 @@ trigger:
 
 ---
 kind: pipeline
+name: mariadb10.0-php7.1
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mariadb10.0-php7.1
+  image: nextcloudci/php7.1:php7.1-16
+  commands:
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
+
+services:
+- name: cache
+  image: redis
+- name: mariadb
+  image: mariadb:10.0
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+
+
+---
+kind: pipeline
 name: mysql-php7.1
 
 steps:
diff --git a/autotest.sh b/autotest.sh
index ca0f16c7d8e..db24517e085 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -283,12 +283,22 @@ function execute_tests {
 			echo "MariaDB is up."
 
 		else
-			if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ] ; then
-				echo "Your mysql binary is not provided by MariaDB"
-				echo "To use the docker container set the USEDOCKER environment variable"
-				exit -1
+			if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI
+				if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ] ; then
+					echo "Your mysql binary is not provided by MariaDB"
+					echo "To use the docker container set the USEDOCKER environment variable"
+					exit -1
+				fi
+				mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
+			else
+				DATABASEHOST=mariadb
 			fi
-			mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
+		fi
+
+		echo "Waiting for MariaDB initialisation ..."
+		if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
+			echo "[ERROR] Waited 600 seconds, no response" >&2
+			exit 1
 		fi
 
 		#Reset _DB to mysql since that is what we use internally