diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-13 19:49:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-13 19:49:54 +0000 |
| commit | 5f001bda683f47a5974933128f126b9ef2860986 (patch) | |
| tree | b8a6f872caa57cffd07de4953593215e3bc3a55f | |
| parent | 33a0bde9081f47e4159d014fc64452619a09ca63 (diff) | |
| parent | d6c0afb74038e330708133edb98ee66b65e30193 (diff) | |
| download | zuul-5f001bda683f47a5974933128f126b9ef2860986.tar.gz | |
Merge "Revert "Test with MariaDB instead of MySQL""
| -rw-r--r-- | bindep.txt | 4 | ||||
| -rw-r--r-- | tools/docker-compose.yaml | 6 | ||||
| -rwxr-xr-x | 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 |