From 0f54198b8c45ba9bda1484b198a785e16acff52b 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: I95ef12935e2ef0b48a45171fc7629e2680cfa1ed --- 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 | 148 ++++++++++++++++++ src/tests/tests.yaml | 10 +- 8 files changed, 223 insertions(+), 33 deletions(-) rename src/tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (94%) create mode 100644 src/tests/bundles/mantic-bobcat.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index 8308441..71c7e68 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -28,51 +28,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 4adb21b..a1e3d97 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: designate-bind build_type: charmcraft - charmcraft_channel: 2.1/stable + charmcraft_channel: 2.x/edge diff --git a/src/metadata.yaml b/src/metadata.yaml index 81b6f70..1bc48da 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -13,8 +13,8 @@ tags: - dns series: - jammy -- kinetic - lunar +- mantic subordinate: false extra-bindings: dns-frontend: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index c3b373c..61c5121 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -68,7 +68,7 @@ applications: channel: latest/edge designate-bind: - charm: ../../../designate-bind_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../designate-bind_ubuntu-22.04-amd64.charm num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml similarity index 94% rename from src/tests/bundles/jammy-zed.yaml rename to src/tests/bundles/jammy-bobcat.yaml index 79c6f68..0906a5c 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 @@ -68,7 +68,7 @@ applications: channel: latest/edge designate-bind: - charm: ../../../designate-bind_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../designate-bind_ubuntu-22.04-amd64.charm num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml index f2005af..330f93c 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -68,7 +68,7 @@ applications: channel: latest/edge designate-bind: - charm: ../../../designate-bind_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../designate-bind_ubuntu-23.04-amd64.charm num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml new file mode 100644 index 0000000..2fe8abb --- /dev/null +++ b/src/tests/bundles/mantic-bobcat.yaml @@ -0,0 +1,148 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: False + +series: mantic + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + series: focal + '8': + +applications: + + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + designate-mysql-router: + charm: ch:mysql-router + channel: latest/edge + neutron-api-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + to: + - '0' + - '1' + - '2' + channel: latest/edge + + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + to: + - '3' + channel: latest/edge + + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + channel: latest/edge + + neutron-api: + charm: ch:neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + to: + - '5' + channel: latest/edge + + designate-bind: + charm: ../../../designate-bind_ubuntu-23.10-amd64.charm + num_units: 1 + # NOTE(ajkavanagh) apparently it has no openstack origin! + #options: + #openstack-origin: *openstack-origin + to: + - '6' + + memcached: + charm: ch:memcached + num_units: 1 + # Note that holding memcached at focal as it's not available at mantic yet. + series: focal + to: + - '7' + + designate: + charm: ch:designate + num_units: 1 + options: + nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' + openstack-origin: *openstack-origin + to: + - '8' + channel: latest/edge + + nrpe: + charm: ch:nrpe + channel: latest/edge + + designate-bind-hacluster: + charm: ch:hacluster + options: + cluster_count: 1 + channel: latest/edge + +relations: + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:shared-db' + - 'designate-mysql-router:shared-db' + - - 'designate-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:amqp' + - 'rabbitmq-server:amqp' + + - - 'designate:identity-service' + - 'keystone:identity-service' + + - - 'designate:dns-backend' + - 'designate-bind:dns-backend' + + - - 'designate:coordinator-memcached' + - 'memcached:cache' + + - - 'designate:dnsaas' + - 'neutron-api:external-dns' + + - - 'neutron-api:identity-service' + - 'keystone:identity-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' + + - - 'designate:nrpe-external-master' + - 'nrpe:nrpe-external-master' + + - - 'designate-bind' + - 'designate-bind-hacluster' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index e550711..f634e28 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,14 +1,15 @@ charm_name: designate-bind smoke_bundles: - - jammy-zed + - jammy-antelope gate_bundles: - - jammy-zed + - jammy-antelope dev_bundles: - - jammy-antelope + - jammy-bobcat - lunar-antelope + - mantic-bobcat tests: - zaza.openstack.charm_tests.designate.tests.DesignateTests @@ -23,6 +24,7 @@ tests_options: force_deploy: # nrpe charm doesn't support jammy+ and needs to be force installed # https://bugs.launchpad.net/charm-nrpe/+bug/1968008 - - jammy-zed - jammy-antelope + - jammy-bobcat - lunar-antelope + - mantic-bobcat