Revert "Test with MariaDB instead of MySQL"

This reverts commit 1c188ad440.

Reason for revert: This change increases test failures; investigation is ongoing.

Change-Id: I3a101656ee0904e1cf6c856dba845385c333260f

bindep.txt

@@ -1,9 +1,9 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
-mariadb-client [test !platform:rpm]
-mariadb-server [test]
+mysql-client [test !platform:rpm]
 mysql [test platform:rpm]
+mysql-server [test]
 postgresql [test]
 libjpeg-dev [test !platform:rpm]
 libjpeg-turbo-devel [test platform:rpm]

tools/docker-compose.yaml

@@ -1,9 +1,9 @@
 version: "3"
 
 services:
-  mariadb:
-    container_name: zuul-test-mariadb
-    image: mariadb:10.6
+  mysql:
+    container_name: zuul-test-mysql
+    image: mysql:8.0
     environment:
       - MYSQL_ROOT_PASSWORD=insecure_worker
     ports:

tools/test-setup-docker.sh

@@ -38,7 +38,7 @@ else
 fi
 
 
-MYSQL="${DOCKER} exec zuul-test-mariadb mysql -u root -pinsecure_worker"
+MYSQL="${DOCKER} exec zuul-test-mysql mysql  -u root -pinsecure_worker"
 
 if [ "${COMPOSE}" == "docker-compose" ]; then
   ${ROOTCMD} docker-compose rm -sf