openstack
/
charm-cinder-backup
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: I6602c57c808917a5158fe4dbb8d311945fa875f7
This commit is contained in:
Alex Kavanagh 2023-04-20 18:59:07 +01:00 committed by Felipe Reyes
parent d0e93cf2ad
commit d42e1b7a7b
6 changed files with 43 additions and 41 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-cinder-backup.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

@ -20,8 +20,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

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

@ -28,13 +28,13 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-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
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -43,7 +43,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -52,14 +52,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
ceph-mon:
charm: ch:ceph-mon
@ -71,7 +71,7 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
channel: quincy/edge
ceph-osd:
charm: ch:ceph-osd
@ -85,7 +85,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: quincy/edge
cinder:
charm: ch:cinder
@ -96,7 +96,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
cinder-backup:
charm: ../../cinder-backup.charm
@ -107,7 +107,7 @@ applications:
charm: ch:cinder-ceph
options:
ceph-osd-replication-count: 3
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -116,7 +116,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -125,7 +125,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
relations:

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

@ -28,24 +28,24 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-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
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
@ -54,14 +54,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
ceph-mon:
charm: ch:ceph-mon
@ -73,7 +73,7 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
channel: quincy/edge
ceph-osd:
charm: ch:ceph-osd
@ -87,7 +87,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: quincy/edge
cinder:
charm: ch:cinder
@ -98,7 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
cinder-backup:
charm: ../../cinder-backup.charm
@ -109,7 +109,7 @@ applications:
charm: ch:cinder-ceph
options:
ceph-osd-replication-count: 3
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -118,7 +118,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -127,7 +127,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
relations:

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

@ -28,24 +28,24 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-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
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
@ -54,14 +54,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
ceph-mon:
charm: ch:ceph-mon
@ -73,7 +73,7 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
channel: quincy/edge
ceph-osd:
charm: ch:ceph-osd
@ -87,7 +87,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: quincy/edge
cinder:
charm: ch:cinder
@ -98,7 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
cinder-backup:
charm: ../../cinder-backup.charm
@ -109,7 +109,7 @@ applications:
charm: ch:cinder-ceph
options:
ceph-osd-replication-count: 3
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -118,7 +118,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -127,7 +127,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
relations: