From 53c63fb68f5d9245af824ee2e1c5da6dfbd22e5f Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 14 Feb 2023 21:26:00 +0000 Subject: [PATCH] Add Antelope support * sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: I330fba7767be527859a8612d0e0117924a0da7ca --- .zuul.yaml | 2 +- charmcraft.yaml | 12 +++ osci.yaml | 2 +- src/metadata.yaml | 1 + src/tests/bundles/jammy-antelope.yaml | 87 +++++++++++++++++++ src/tests/bundles/jammy-zed.yaml | 2 +- src/tests/bundles/kinetic-zed.yaml | 2 +- .../{jammy-yoga.yaml => lunar-antelope.yaml} | 4 +- 8 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 src/tests/bundles/jammy-antelope.yaml rename src/tests/bundles/{jammy-yoga.yaml => lunar-antelope.yaml} (97%) diff --git a/.zuul.yaml b/.zuul.yaml index 23bf5f6..fd20909 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-zed-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index 4c7e885..8308441 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -31,6 +31,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [amd64] + - name: ubuntu + channel: "23.04" + architectures: [amd64] - build-on: - name: ubuntu channel: "22.04" @@ -42,6 +45,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [arm64] + - name: ubuntu + channel: "23.04" + architectures: [arm64] - build-on: - name: ubuntu channel: "22.04" @@ -53,6 +59,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [ppc64el] + - name: ubuntu + channel: "23.04" + architectures: [ppc64el] - build-on: - name: ubuntu channel: "22.04" @@ -64,3 +73,6 @@ bases: - name: ubuntu channel: "22.10" architectures: [s390x] + - name: ubuntu + channel: "23.04" + architectures: [s390x] diff --git a/osci.yaml b/osci.yaml index e8cacf9..cc7f621 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,7 +1,7 @@ - project: templates: - charm-unit-jobs-py310 - - charm-zed-functional-jobs + - charm-functional-jobs vars: needs_charm_build: true charm_build_name: cinder-purestorage diff --git a/src/metadata.yaml b/src/metadata.yaml index 922e330..fd466ac 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -13,6 +13,7 @@ tags: series: - jammy - kinetic +- lunar subordinate: true provides: storage-backend: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml new file mode 100644 index 0000000..1bd3894 --- /dev/null +++ b/src/tests/bundles/jammy-antelope.yaml @@ -0,0 +1,87 @@ +variables: + openstack-origin: &openstack-origin cloud:jammy-antelope + +local_overlay_enabled: False + +series: jammy + +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': + +relations: + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'cinder:storage-backend' + - 'cinder-purestorage:storage-backend' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + +applications: + keystone-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 + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + channel: latest/edge + cinder: + charm: ch:cinder + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + channel: latest/edge + cinder-purestorage: + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + options: +# Add config options here + driver-source: ppa:openstack-charmers/purestorage-stable + protocol: iscsi + volume-backend-name: cinder-pure + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + to: + - '5' + channel: latest/edge diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml index b9aede1..88bbe53 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml index 459fad2..c140366 100644 --- a/src/tests/bundles/kinetic-zed.yaml +++ b/src/tests/bundles/kinetic-zed.yaml @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/lunar-antelope.yaml similarity index 97% rename from src/tests/bundles/jammy-yoga.yaml rename to src/tests/bundles/lunar-antelope.yaml index efce58f..6853523 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: jammy +series: lunar comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable