From d6c0afb74038e330708133edb98ee66b65e30193 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 13 Apr 2023 13:38:13 +0000
Subject: Revert "Test with MariaDB instead of MySQL"

This reverts commit 1c188ad440e82bb356832497c387aace71653dc8.

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

Change-Id: I3a101656ee0904e1cf6c856dba845385c333260f
---
 bindep.txt                 | 4 ++--
 tools/docker-compose.yaml  | 6 +++---
 tools/test-setup-docker.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 04cf0c797..2e9c5e696 100644
--- a/bindep.txt
+++ b/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]
diff --git a/tools/docker-compose.yaml b/tools/docker-compose.yaml
index 743be6988..05b4905e2 100644
--- a/tools/docker-compose.yaml
+++ b/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:
diff --git a/tools/test-setup-docker.sh b/tools/test-setup-docker.sh
index 6000230bb..1601b11a7 100755
--- a/tools/test-setup-docker.sh
+++ b/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
-- 
cgit v1.2.1