From 09b8f16f10f94b781f340bf24306459cb1f40475 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: I371f1e473e9588d2e7e66a4372bfedf8ab427770 --- charmcraft.yaml | 86 ++++++++++++++----- osci.yaml | 2 +- src/config.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 | 81 +++++++++++++++++ src/tests/tests.yaml | 10 ++- 9 files changed, 157 insertions(+), 34 deletions(-) rename src/tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (90%) 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 794adbe..69e050f 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: barbican build_type: charmcraft - charmcraft_channel: 2.1/stable + charmcraft_channel: 2.x/edge diff --git a/src/config.yaml b/src/config.yaml index 2badb34..1097fb3 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -45,7 +45,7 @@ options: description: | Maximum allowed http request size against the barbican-api. openstack-origin: - default: antelope + default: bobcat use-internal-endpoints: default: True type: boolean diff --git a/src/metadata.yaml b/src/metadata.yaml index 2f9fa2c..8046685 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -9,8 +9,8 @@ tags: - openstack series: - jammy -- kinetic - lunar +- mantic subordinate: false requires: shared-db: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 2580387..27a0e5d 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -47,7 +47,7 @@ applications: barbican: series: *series - charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../barbican_ubuntu-22.04-amd64.charm num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml similarity index 90% rename from src/tests/bundles/jammy-zed.yaml rename to src/tests/bundles/jammy-bobcat.yaml index 3396cd1..60d2534 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 @@ -47,7 +47,7 @@ applications: barbican: series: *series - charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../barbican_ubuntu-22.04-amd64.charm num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml index c9d8672..f7e09b6 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -47,7 +47,7 @@ applications: barbican: series: *series - charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + charm: ../../../barbican_ubuntu-23.04-amd64.charm num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml new file mode 100644 index 0000000..25dcf5b --- /dev/null +++ b/src/tests/bundles/mantic-bobcat.yaml @@ -0,0 +1,81 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: False + +series: &series mantic + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + +applications: + + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + barbican-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 + + barbican: + series: *series + charm: ../../../barbican_ubuntu-23.10-amd64.charm + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + to: + - '4' + + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + to: + - '5' + channel: latest/edge + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'barbican:shared-db' + - 'barbican-mysql-router:shared-db' + - - 'barbican-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'barbican:identity-service' + + - - 'rabbitmq-server:amqp' + - 'barbican:amqp' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 60aa01b..37eff88 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,13 +1,15 @@ charm_name: barbican smoke_bundles: -- jammy-zed -gate_bundles: -- jammy-zed -dev_bundles: - jammy-antelope +gate_bundles: +- jammy-antelope +dev_bundles: +- jammy-bobcat - lunar-antelope +- mantic-bobcat tests: - zaza.openstack.charm_tests.barbican.tests.BarbicanTest tests_options: force_deploy: - lunar-antelope + - mantic-bobcat