openstack/trove
Code Issues Proposed changes

Change settings for stable/2023.1

Browse Source 
Change-Id: I90c4c3694c0010fa57fff1e994ede2d3bf9ba17f
This commit is contained in:
wu.chunyang
2023-06-30 10:11:57 +08:00
parent 1e7bfafdc5
commit 53eef3bc7b
7 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/settings
View File

@@ -4,21 +4,21 @@
# Set up default directories
TROVE_DIR=${TROVE_DIR:-${DEST}/trove}
TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
TROVE_BRANCH=${TROVE_BRANCH:-master}
TROVE_BRANCH=${TROVE_BRANCH:-stable/2023.1}
# Default is set to False
TROVE_ENABLE_LOCAL_REGISTRY=${TROVE_ENABLE_LOCAL_REGISTRY:-False}
TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${DEST}/python-troveclient}}
TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_BASE}/openstack/python-troveclient.git}}
TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}}
TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-stable/2023.1}}
TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${DEST}/trove-dashboard}
TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-master}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-stable/2023.1}
TRIPLEO_IMAGES_DIR=${TRIPLEO_IMAGES_DIR:-${DEST}/tripleo-image-elements}
TRIPLEO_IMAGES_REPO=${TRIPLEO_IMAGES_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-master}
TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-stable/2023.1}
# Set up configuration directory and files
TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}

4
integration/scripts/files/elements/guest-agent/source-repository-guest-agent
View File

@@ -1,3 +1,3 @@
# This is used for source-based builds
guest-agent git /opt/guest-agent https://opendev.org/openstack/trove master
upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
guest-agent git /opt/guest-agent https://opendev.org/openstack/trove stable/2023.1
upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/2023.1

2
integration/scripts/trovestack
View File

@@ -724,7 +724,7 @@ function cmd_test_init() {
exclaim "Re-installing python-troveclient from git"
pip3 uninstall -y python-troveclient
pip3 install -U git+https://opendev.org/openstack/python-troveclient@master#egg=python-troveclient
pip3 install -U git+https://opendev.org/openstack/python-troveclient@stable/2023.1#egg=python-troveclient
}
# Build trove guest image

6
integration/scripts/trovestack.rc
View File

@@ -59,13 +59,13 @@ GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}
TROVE_DIR=${TROVE_DIR:-${PATH_TROVE}}
TROVE_BRANCH=${TROVE_BRANCH:-master}
TROVE_BRANCH=${TROVE_BRANCH:-stable/2023.1}
TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_OPENSTACK}/python-troveclient.git}}
TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${PATH_PYTHON_TROVECLIENT}}}
TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}}
TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-stable/2023.1}}
TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${TROVEDASHBOARD_REPO:-${GIT_OPENSTACK}/trove-dashboard.git}}
TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${TROVEDASHBOARD_DIR:-${PATH_TROVE_DASHBOARD}}}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-${TROVEDASHBOARD_BRANCH:-master}}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-${TROVEDASHBOARD_BRANCH:-stable/2023.1}}
# Trove specific networking options
TROVE_PRIVATE_NETWORK_NAME=private
TROVE_PRIVATE_SUBNET_NAME=private-subnet

2
trove/common/cfg.py
View File

@@ -1454,7 +1454,7 @@ rpcapi_cap_opts = [
'taskmanager', default='latest',
help='Set a version cap for messages sent to taskmanager services'),
cfg.StrOpt(
'guestagent', default='latest',
'guestagent', default='2023.1',
help='Set a version cap for messages sent to guestagent services'),
cfg.StrOpt(
'conductor', default='latest',

1
trove/guestagent/api.py
View File

@@ -60,6 +60,7 @@ class API(object):
'newton': '1.0',
'ussuri': '1.0',
'victoria': '1.1',
'2023.1': '1.1',
'latest': API_LATEST_VERSION
}

16
zuul.d/jobs.yaml
View File

@@ -301,6 +301,8 @@
usage_timeout: 1800
test-config:
$TEMPEST_CONFIG:
auth:
tempest_roles: ResellerAdmin
database:
default_datastore_versions: mysql:5.7.29
devstack_plugins:
@@ -324,6 +326,7 @@
s-container: true
s-object: true
s-proxy: true
tls-proxy: false
tempest: true
q-svc: true
q-agt: true
@@ -334,6 +337,7 @@
ovn-controller: false
ovn-northd: false
tempest_test_regex: ^trove_tempest_plugin\.tests
tempest_test_timeout: 3600
tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_blacklist.txt'
- job:
@@ -373,6 +377,8 @@
usage_timeout: 1800
test-config:
$TEMPEST_CONFIG:
auth:
tempest_roles: ResellerAdmin
database:
enabled_datastores: "postgresql"
default_datastore_versions: "postgresql:12"
@@ -397,6 +403,7 @@
s-container: true
s-object: true
s-proxy: true
tls-proxy: false
tempest: true
q-svc: true
q-agt: true
@@ -407,6 +414,7 @@
ovn-controller: false
ovn-northd: false
tempest_test_regex: ^trove_tempest_plugin\.tests
tempest_test_timeout: 3600
tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_blacklist.txt'
- job:
@@ -435,7 +443,7 @@
guest_os: ubuntu
guest_os_release: focal
guest_username: ubuntu
branch: master
branch: 2023.1
dev_mode: false
image_suffix: ""
@@ -455,7 +463,7 @@
guest_os: ubuntu
guest_os_release: focal
guest_username: ubuntu
branch: master
branch: 2023.1
dev_mode: false
image_suffix: ""
@@ -469,7 +477,7 @@
guest_os: ubuntu
guest_os_release: focal
guest_username: ubuntu
branch: master
branch: 2023.1
dev_mode: false
image_suffix: ""
@@ -483,7 +491,7 @@
guest_os: ubuntu
guest_os_release: focal
guest_username: ubuntu
branch: master
branch: 2023.1
dev_mode: true
image_suffix: "-dev"