From 603a2f48f0e9dc42cebb53df95f18344e32df8f5 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Wed, 8 Nov 2023 17:32:47 +0800 Subject: [PATCH] [CI] Add mariadb10.4 jobs in zuul. Add mariadb10.4 tests in zuul. Depends-On: https://review.opendev.org/c/openstack/trove-tempest-plugin/+/900498 Change-Id: I5635a7e5fb2fe8bbd6e6dfa56fe7969f3a03cf9c --- devstack/settings | 1 + zuul.d/jobs.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ zuul.d/projects.yaml | 3 +++ 3 files changed, 46 insertions(+) diff --git a/devstack/settings b/devstack/settings index 509c2b8fad..515271ed31 100644 --- a/devstack/settings +++ b/devstack/settings @@ -99,6 +99,7 @@ if [ "$TROVE_ENABLE_LOCAL_REGISTRY" == "True" ] ; then TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-postgresql"} else TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"docker.io/library/mysql"} + TROVE_DATABASE_IMAGE_MARIADB=${TROVE_DATABASE_IMAGE_MARIAD:-"docker.io/library/mariadb"} TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"} TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d4214934a0..f9a52bbaf8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -441,6 +441,48 @@ database: default_datastore_versions: mysql:5.7 +- job: + name: trove-tempest-ubuntu-base-mariadb10.4 + parent: trove-tempest-ubuntu-base + vars: + devstack_localrc: + TROVE_DATASTORE_TYPE: mariadb + TROVE_DATASTORE_VERSION: 10.4 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + database: + enabled_datastores: "mariadb" + default_datastore_versions: mariadb:10.4 + +- job: + name: trove-tempest-ubuntu-backup-mariadb10.4 + parent: trove-tempest-ubuntu-backup + vars: + devstack_localrc: + TROVE_DATASTORE_TYPE: mariadb + TROVE_DATASTORE_VERSION: 10.4 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + database: + enabled_datastores: "mariadb" + default_datastore_versions: mariadb:10.4 + +- job: + name: trove-tempest-ubuntu-replication-mariadb10.4 + parent: trove-tempest-ubuntu-replication + vars: + devstack_localrc: + TROVE_DATASTORE_TYPE: mariadb + TROVE_DATASTORE_VERSION: 10.4 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + database: + enabled_datastores: "mariadb" + default_datastore_versions: mariadb:10.4 + - job: name: trove-tempest-postgres parent: devstack-tempest diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 453af91e5c..1fd0b27639 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -14,6 +14,9 @@ - trove-tempest-ubuntu-base-mysql5.7 - trove-tempest-ubuntu-backup-mysql5.7 - trove-tempest-ubuntu-replication-mysql5.7 + - trove-tempest-ubuntu-base-mariadb10.4 + - trove-tempest-ubuntu-backup-mariadb10.4 + - trove-tempest-ubuntu-replication-mariadb10.4 - openstack-tox-cover: voting: true - trove-tox-bandit-baseline: