openstack/trove
Code Issues Proposed changes

[CI] Add mariadb10.4 jobs in zuul.

Browse Source 
Add mariadb10.4 tests in zuul.

Depends-On: https://review.opendev.org/c/openstack/trove-tempest-plugin/+/900498

Change-Id: I5635a7e5fb2fe8bbd6e6dfa56fe7969f3a03cf9c
This commit is contained in:
wu.chunyang 2023-11-08 17:32:47 +08:00
parent a60b63d7ab
commit 603a2f48f0
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/settings
View File

@ -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"} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-postgresql"}
else else
TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"docker.io/library/mysql"} 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_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"}
TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""} 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"} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"}

42
zuul.d/jobs.yaml
View File

@ -441,6 +441,48 @@
database: database:
default_datastore_versions: mysql:5.7 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: - job:
name: trove-tempest-postgres name: trove-tempest-postgres
parent: devstack-tempest parent: devstack-tempest

3
zuul.d/projects.yaml
View File

@ -14,6 +14,9 @@
- trove-tempest-ubuntu-base-mysql5.7 - trove-tempest-ubuntu-base-mysql5.7
- trove-tempest-ubuntu-backup-mysql5.7 - trove-tempest-ubuntu-backup-mysql5.7
- trove-tempest-ubuntu-replication-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: - openstack-tox-cover:
voting: true voting: true
- trove-tox-bandit-baseline: - trove-tox-bandit-baseline: