From 3c19c22b4a32287468bcfbc82f7a74554d2e3f54 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 18 Jul 2023 16:47:18 -0400 Subject: [PATCH] Add 2023.2 Bobcat support * sync charm-helpers to classic charms * change openstack-origin/source default to bobcat * add mantic to metadata series * align testing with bobcat * add new bobcat bundles * add bobcat bundles to tests.yaml * add bobcat tests to osci.yaml * update build-on and run-on bases * drop kinetic * update charmcraft_channel to 2.x/edge Change-Id: I0dfabd48efb8b3b453ab33ef5a1c2354b9787d63 --- charmcraft.yaml | 86 +++++++++++++----- osci.yaml | 2 +- src/metadata.yaml | 2 +- src/tests/bundles/jammy-antelope.yaml | 2 +- .../{jammy-zed.yaml => jammy-bobcat.yaml} | 4 +- src/tests/bundles/lunar-antelope.yaml | 2 +- src/tests/bundles/mantic-bobcat.yaml | 87 +++++++++++++++++++ src/tests/tests.yaml | 2 + 8 files changed, 158 insertions(+), 29 deletions(-) rename src/tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (91%) create mode 100644 src/tests/bundles/mantic-bobcat.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index 8a01ba4..ac7b9e8 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -29,51 +29,91 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64] + - build-on: - name: ubuntu - channel: "22.10" + channel: "22.04" + architectures: [s390x] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [s390x] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [ppc64el] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [ppc64el] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [arm64] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [arm64] + - build-on: + - name: ubuntu + channel: "23.04" architectures: [amd64] + run-on: - name: ubuntu channel: "23.04" architectures: [amd64] - build-on: - name: ubuntu - channel: "22.04" - architectures: [arm64] + channel: "23.04" + architectures: [s390x] run-on: - - name: ubuntu - channel: "22.04" - architectures: [arm64] - - name: ubuntu - channel: "22.10" - architectures: [arm64] - name: ubuntu channel: "23.04" - architectures: [arm64] + architectures: [s390x] - build-on: - name: ubuntu - channel: "22.04" + channel: "23.04" architectures: [ppc64el] run-on: - - name: ubuntu - channel: "22.04" - architectures: [ppc64el] - - name: ubuntu - channel: "22.10" - architectures: [ppc64el] - name: ubuntu channel: "23.04" architectures: [ppc64el] - build-on: - name: ubuntu - channel: "22.04" + channel: "23.04" + architectures: [arm64] + run-on: + - name: ubuntu + channel: "23.04" + architectures: [arm64] + - build-on: + - name: ubuntu + channel: "23.10" + architectures: [amd64] + run-on: + - name: ubuntu + channel: "23.10" + architectures: [amd64] + - build-on: + - name: ubuntu + channel: "23.10" architectures: [s390x] run-on: - name: ubuntu - channel: "22.04" + channel: "23.10" architectures: [s390x] + - build-on: - name: ubuntu - channel: "22.10" - architectures: [s390x] + channel: "23.10" + architectures: [ppc64el] + run-on: - name: ubuntu - channel: "23.04" - architectures: [s390x] + channel: "23.10" + architectures: [ppc64el] + - build-on: + - name: ubuntu + channel: "23.10" + architectures: [arm64] + run-on: + - name: ubuntu + channel: "23.10" + architectures: [arm64] diff --git a/osci.yaml b/osci.yaml index cc7f621..c779036 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: cinder-purestorage build_type: charmcraft - charmcraft_channel: 2.1/stable + charmcraft_channel: 2.x/edge diff --git a/src/metadata.yaml b/src/metadata.yaml index fd466ac..ea702ad 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,8 +12,8 @@ tags: - misc series: - jammy -- kinetic - lunar +- mantic subordinate: true provides: storage-backend: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 1bd3894..e899305 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml similarity index 91% rename from src/tests/bundles/jammy-zed.yaml rename to src/tests/bundles/jammy-bobcat.yaml index 88bbe53..3a2a9f6 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-zed + openstack-origin: &openstack-origin cloud:jammy-bobcat local_overlay_enabled: False @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml index 6853523..1d0689d 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -73,7 +73,7 @@ applications: - '4' channel: latest/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-23.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml new file mode 100644 index 0000000..5123c17 --- /dev/null +++ b/src/tests/bundles/mantic-bobcat.yaml @@ -0,0 +1,87 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: False + +series: mantic + +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-23.10-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/tests.yaml b/src/tests/tests.yaml index f77da76..4b17f86 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -12,6 +12,8 @@ smoke_bundles: dev_bundles: - focal-yoga - jammy-yoga + - jammy-bobcat + - mantic-bobcat tests_options: force_deploy: - jammy-yoga