diff options
author | Zuul <zuul@review.opendev.org> | 2023-02-27 16:11:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-02-27 16:11:02 +0000 |
commit | 60a202d06539ca6da9136b7dfab1275ddade5fb6 (patch) | |
tree | c8e4037d78addff6ff42fe00c6bb40ef781b1160 /zuul.d/jobs.yaml | |
parent | 9bc08ffdc07745b14084e935a5b8c5b50131f5b3 (diff) | |
parent | 1f1e2becfeecb3a7e061898890c49821eef95672 (diff) | |
download | trove-60a202d06539ca6da9136b7dfab1275ddade5fb6.tar.gz |
Merge "Using local registry in devstack."
Diffstat (limited to 'zuul.d/jobs.yaml')
-rw-r--r-- | zuul.d/jobs.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 032f4776..6ea9188b 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -46,6 +46,8 @@ Q_PLUGIN: ml2 Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + TROVE_ENABLE_LOCAL_REGISTRY: True + TROVE_DATASTORE_VERSION: 5.7 run: playbooks/trove-devstack-base.yaml irrelevant-files: - ^.*\.rst$ @@ -290,11 +292,17 @@ Q_PLUGIN: ml2 Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + TROVE_ENABLE_LOCAL_REGISTRY: True + TROVE_DATASTORE_VERSION: 5.7 devstack_local_conf: post-config: $TROVE_CONF: DEFAULT: usage_timeout: 1800 + test-config: + $TEMPEST_CONFIG: + database: + default_datastore_versions: mysql:5.7 devstack_plugins: trove: https://opendev.org/openstack/trove.git devstack_services: @@ -356,7 +364,8 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch TROVE_DATASTORE_TYPE: postgresql - TROVE_DATASTORE_VERSION: 12.4 + TROVE_DATASTORE_VERSION: 12 + TROVE_ENABLE_LOCAL_REGISTRY: True devstack_local_conf: post-config: $TROVE_CONF: @@ -366,7 +375,7 @@ $TEMPEST_CONFIG: database: enabled_datastores: "postgresql" - default_datastore_versions: "postgresql:12.4" + default_datastore_versions: "postgresql:12" devstack_plugins: trove: https://opendev.org/openstack/trove.git devstack_services: |