From ebbaf4ff845103f864e3f66772e7fcceeba73d29 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 21 Mar 2023 00:03:50 +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: I0f668ccbd04927a98cfdb4065db41b8922d9c0a6 --- .zuul.yaml | 2 +- charmcraft.yaml | 12 ++++++++++ osci.yaml | 2 +- src/metadata.yaml | 1 + src/tests/bundles/jammy-antelope.yaml | 24 +++++++++++++++++++ src/tests/bundles/jammy-zed.yaml | 2 +- src/tests/bundles/kinetic-zed.yaml | 2 +- .../{jammy-yoga.yaml => lunar-antelope.yaml} | 4 ++-- src/tests/tests.yaml | 8 ++++--- 9 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 src/tests/bundles/jammy-antelope.yaml rename src/tests/bundles/{jammy-yoga.yaml => lunar-antelope.yaml} (89%) 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 351a19e..d6e8071 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -33,6 +33,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [amd64] + - name: ubuntu + channel: "23.04" + architectures: [amd64] - build-on: - name: ubuntu channel: "22.04" @@ -44,6 +47,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [arm64] + - name: ubuntu + channel: "23.04" + architectures: [arm64] - build-on: - name: ubuntu channel: "22.04" @@ -55,6 +61,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [ppc64el] + - name: ubuntu + channel: "23.04" + architectures: [ppc64el] - build-on: - name: ubuntu channel: "22.04" @@ -66,3 +75,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 bfcc6fe..908c9f3 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: ovn-central diff --git a/src/metadata.yaml b/src/metadata.yaml index 8e87496..f38745b 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -26,6 +26,7 @@ tags: series: - jammy - kinetic +- lunar subordinate: false provides: ovsdb: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml new file mode 100644 index 0000000..93a689d --- /dev/null +++ b/src/tests/bundles/jammy-antelope.yaml @@ -0,0 +1,24 @@ +variables: + openstack-origin: &openstack-origin cloud:jammy-antelope + +local_overlay_enabled: False + +series: jammy + +applications: + + vault: + charm: ch:vault + num_units: 1 + channel: latest/edge + + ovn-central: + charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + num_units: 3 + options: + source: *openstack-origin + +relations: + + - - 'ovn-central:certificates' + - 'vault:certificates' diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml index eba8305..449f9e3 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -13,7 +13,7 @@ applications: channel: latest/edge ovn-central: - charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: source: *openstack-origin diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml index bd8969c..59beb04 100644 --- a/src/tests/bundles/kinetic-zed.yaml +++ b/src/tests/bundles/kinetic-zed.yaml @@ -13,7 +13,7 @@ applications: channel: latest/edge ovn-central: - charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: source: *openstack-origin diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/lunar-antelope.yaml similarity index 89% rename from src/tests/bundles/jammy-yoga.yaml rename to src/tests/bundles/lunar-antelope.yaml index 70b0563..64fd378 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 applications: @@ -13,7 +13,7 @@ applications: channel: latest/edge ovn-central: - charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: source: *openstack-origin diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index c3e9964..cffc004 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,15 +1,16 @@ charm_name: ovn-central gate_bundles: -- jammy-yoga +- jammy-zed smoke_bundles: -- jammy-yoga +- jammy-zed dev_bundles: -- jammy-yoga - jammy-zed +- jammy-antelope - kinetic-zed +- lunar-antelope target_deploy_status: ovn-central: @@ -35,3 +36,4 @@ tests: tests_options: force_deploy: - kinetic-zed + - lunar-antelope