openstack
/
charm-heat
Code Issues Proposed changes

Stable artefacts for stable/2023.1 (antelope) 

This patch is to lock the stable/2023.1 (antelope release) charms
down so that as much as possible.
In particular, this patch does:

- set the .gitreview to stable/2023.1
- lock zaza and zaza-openstack-tests to stable/antelope branches
- for reactive charms Add build.lock files to lock the layers
  and python modules used to build the charm.
- for ops framework charms, extract a pip freeze from the
  charmcraft container after building the charm to lock the
  modules used to build the charm.
- drop the kinetic bundles if the exist. (Note the updates to
  tests.yaml is in another batch (topic: antelope-voting)
- update the bundles so that they point to the antelope specific
  channels.  e.g. 2023.1/edge for OpenStack charms, 23.03/edge for
  OVN charms, quincy/edge for Ceph charms and generally, the
  appropriate LTS Jammy branch for the various support charms.

Change-Id: Ia42907e1ac25360d7a7db9ee900d3a15633335b5
This commit is contained in:
Alex Kavanagh 2023-04-20 19:01:12 +01:00
parent f833f47591
commit 992d2023cb
6 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-heat.git
defaultbranch=stable/2023.1

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/antelope
destination: hooks/charmhelpers
include:
- core

4
test-requirements.txt
View File

@ -19,8 +19,8 @@ cliff<3.0.0
coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/antelope#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest

34
tests/bundles/jammy-antelope.yaml
View File

@ -30,33 +30,33 @@ applications:
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -65,14 +65,14 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2023.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
glance:
charm: ch:glance
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -92,7 +92,7 @@ applications:
network-manager: Neutron
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -103,7 +103,7 @@ applications:
enable-live-migration: "False"
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -113,7 +113,7 @@ applications:
debug: "True"
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -133,11 +133,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
heat:
charm: ../../heat.charm

34
tests/bundles/jammy-zed.yaml
View File

@ -30,33 +30,33 @@ applications:
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -65,14 +65,14 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2023.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
glance:
charm: ch:glance
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -92,7 +92,7 @@ applications:
network-manager: Neutron
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -103,7 +103,7 @@ applications:
enable-live-migration: "False"
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -113,7 +113,7 @@ applications:
debug: "True"
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -133,11 +133,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
heat:
charm: ../../heat.charm

34
tests/bundles/lunar-antelope.yaml
View File

@ -30,33 +30,33 @@ applications:
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -65,14 +65,14 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2023.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
glance:
charm: ch:glance
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -92,7 +92,7 @@ applications:
network-manager: Neutron
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -103,7 +103,7 @@ applications:
enable-live-migration: "False"
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -113,7 +113,7 @@ applications:
debug: "True"
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -133,11 +133,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
heat:
charm: ../../heat.charm