From fafe40f2d2f5e06c70a5b9c9c19be56732154791 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 20 Apr 2023 18:58:58 +0100 Subject: [PATCH] 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: I35814ec1f82d37e77b4a63768b2da6d553774226 --- .gitreview | 2 + charm-helpers-hooks.yaml | 2 +- test-requirements.txt | 4 +- tests/bundles/jammy-antelope.yaml | 36 ++--- tests/bundles/jammy-zed.yaml | 36 ++--- tests/bundles/kinetic-zed.yaml | 261 ------------------------------ tests/bundles/lunar-antelope.yaml | 36 ++--- 7 files changed, 59 insertions(+), 318 deletions(-) delete mode 100644 tests/bundles/kinetic-zed.yaml diff --git a/.gitreview b/.gitreview index 7a260e49..fa40ff50 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-cinder.git + +defaultbranch=stable/2023.1 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 6cb53eb4..fa502864 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/antelope destination: charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index e972406e..188778ea 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml index 59a17a36..aa36fdd4 100644 --- a/tests/bundles/jammy-antelope.yaml +++ b/tests/bundles/jammy-antelope.yaml @@ -27,40 +27,40 @@ applications: 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 cinder-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 rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '3' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -71,7 +71,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -81,7 +81,7 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: latest/edge + channel: 2023.1/edge neutron-api: charm: ch:neutron-api @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -102,7 +102,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2023.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2023.1/edge glance: charm: ch:glance @@ -121,11 +121,11 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2023.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2023.1/edge nova-compute: charm: ch:nova-compute @@ -143,7 +143,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: latest/edge + channel: 2023.1/edge cinder: charm: ../../cinder.charm @@ -163,7 +163,7 @@ applications: options: block-device: "/mnt/cinder-lvm-block|20G" config-flags: "target_helper=lioadm" - channel: latest/edge + channel: 2023.1/edge relations: diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-zed.yaml index 231f4732..7a8fcbdc 100644 --- a/tests/bundles/jammy-zed.yaml +++ b/tests/bundles/jammy-zed.yaml @@ -27,40 +27,40 @@ applications: 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 cinder-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 rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '3' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -71,7 +71,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -81,7 +81,7 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: latest/edge + channel: 2023.1/edge neutron-api: charm: ch:neutron-api @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -102,7 +102,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2023.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2023.1/edge glance: charm: ch:glance @@ -121,11 +121,11 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2023.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2023.1/edge nova-compute: charm: ch:nova-compute @@ -143,7 +143,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: latest/edge + channel: 2023.1/edge cinder: charm: ../../cinder.charm @@ -163,7 +163,7 @@ applications: options: block-device: "/mnt/cinder-lvm-block|20G" config-flags: "target_helper=lioadm" - channel: latest/edge + channel: 2023.1/edge relations: diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index cae4a867..00000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,261 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: kinetic - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - constraints: mem=8192M - '11': - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - debug: true - openstack-origin: *openstack-origin - to: - - '4' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '5' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '6' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '7' - channel: latest/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '8' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - constraints: mem=4G cores=4 - storage: - ephemeral-device: '40G' - options: - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - #ephemeral-device: /dev/vdb - #ephemeral-unmount: /mnt - debug: true - openstack-origin: *openstack-origin - to: - - '10' - channel: latest/edge - - cinder: - charm: ../../cinder.charm - num_units: 1 - storage: - block-devices: '40G' - options: - openstack-origin: *openstack-origin - glance-api-version: 2 - block-device: None - overwrite: "true" - to: - - '11' - - cinder-lvm: - charm: ch:cinder-lvm - options: - block-device: "/mnt/cinder-lvm-block|20G" - config-flags: "target_helper=lioadm" - channel: latest/edge - -relations: - - - - 'cinder:storage-backend' - - 'cinder-lvm:storage-backend' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/lunar-antelope.yaml index 27b9a689..b4d98812 100644 --- a/tests/bundles/lunar-antelope.yaml +++ b/tests/bundles/lunar-antelope.yaml @@ -27,40 +27,40 @@ applications: 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 cinder-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 rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '3' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -71,7 +71,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -81,7 +81,7 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: latest/edge + channel: 2023.1/edge neutron-api: charm: ch:neutron-api @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -102,7 +102,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2023.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2023.1/edge glance: charm: ch:glance @@ -121,11 +121,11 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2023.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2023.1/edge nova-compute: charm: ch:nova-compute @@ -143,7 +143,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: latest/edge + channel: 2023.1/edge cinder: charm: ../../cinder.charm @@ -163,7 +163,7 @@ applications: options: block-device: "/mnt/cinder-lvm-block|20G" config-flags: "target_helper=lioadm" - channel: latest/edge + channel: 2023.1/edge relations: