zuul
/
zuul
Code Issues Proposed changes

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
This commit is contained in:
James E. Blair 2023-04-13 13:38:13 +00:00
parent 1c188ad440
commit d6c0afb740
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindep.txt
View File

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

6
tools/docker-compose.yaml
View File

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

2
tools/test-setup-docker.sh
View File

@ -38,7 +38,7 @@ else
fi 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 if [ "${COMPOSE}" == "docker-compose" ]; then
${ROOTCMD} docker-compose rm -sf ${ROOTCMD} docker-compose rm -sf