Skip to content

Commit 16718b5

Browse files
committed
ci: Bump devstack to 2023.2
Also bump Ubuntu image to 22.04
1 parent 575dae0 commit 16718b5

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
ENABLED_SERVICES+=,g-api
3636

3737
# Neutron
38-
ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-trunk
39-
38+
ENABLED_SERVICES+=,neutron-api,neutron-dhcp,neutron-trunk
4039
ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos
40+
4141
# Octavia
4242
ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
4343

hack/ci/cloud-init/worker.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
3030

3131
# Nova
32-
ENABLED_SERVICES=n-cpu,placement-client,c-vol,neutron-agent
32+
ENABLED_SERVICES=n-cpu,placement-client,c-vol
3333
VOLUME_BACKING_FILE_SIZE=100G
3434

3535
# Additional services

hack/ci/create_devstack.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
3131

3232
CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}
3333

34-
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"yoga"}
34+
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2023.2"}
3535
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}
3636

3737
# Devstack will create a provider network using this range
@@ -85,11 +85,6 @@ function ensure_openstack_client {
8585

8686
# We explicitly pin to the stable branch version of openstackclient.
8787
curl -L https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE} -o /tmp/openstack-constraints
88-
89-
# Hack for yoga only: wrapt <1.14 doesn't support python 3.11
90-
[ "${OPENSTACK_RELEASE}" == "yoga" ] || exit 1 # Delete this hack
91-
sed -i "s/^wrapt===1\.13.*/wrapt===1.14.1/" /tmp/openstack-constraints
92-
9388
pip install -c /tmp/openstack-constraints \
9489
python-openstackclient python-cinderclient \
9590
python-glanceclient python-keystoneclient \

hack/ci/gce-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function create_vm {
9595
--zone "$GCP_ZONE" \
9696
--enable-nested-virtualization \
9797
--image-project ubuntu-os-cloud \
98-
--image-family ubuntu-2004-lts \
98+
--image-family ubuntu-2204-lts \
9999
--boot-disk-size 200G \
100100
--boot-disk-type pd-ssd \
101101
--can-ip-forward \

0 commit comments

Comments
 (0)