From 4bcf39ae51b237731a4014601f8246493ece1c0f Mon Sep 17 00:00:00 2001 From: Dmitrii Shcherbakov Date: Sat, 15 Apr 2023 00:29:02 +0300 Subject: [PATCH] Add Antelope support * 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 * Voting was turned on for jammy-antelope in the project-template for charm-functional-jobs in zosci-config * Voting for jammy-antelope bundles with non-standard names is turned on in individual charms * Kinetic-zed bundles/tests are removed Change-Id: I1215592725d1941f214738ee86250c74a398ee9a --- .zuul.yaml | 2 +- charmcraft.yaml | 12 ++++++++++++ osci.yaml | 2 +- src/metadata.yaml | 1 + .../bundles/{jammy-yoga.yaml => jammy-antelope.yaml} | 8 +++++--- src/tests/bundles/jammy-zed.yaml | 2 +- .../{kinetic-zed.yaml => lunar-antelope.yaml} | 6 +++--- src/tests/tests.yaml | 10 +++++----- 8 files changed, 29 insertions(+), 14 deletions(-) rename src/tests/bundles/{jammy-yoga.yaml => jammy-antelope.yaml} (77%) rename src/tests/bundles/{kinetic-zed.yaml => lunar-antelope.yaml} (92%) 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 2bbe451..10cfae8 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 5e49d37..eb1b05f 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-dedicated-chassis diff --git a/src/metadata.yaml b/src/metadata.yaml index b7cd6c6..73be22d 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -9,6 +9,7 @@ tags: series: - jammy - kinetic +- lunar subordinate: false extra-bindings: data: diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-antelope.yaml similarity index 77% rename from src/tests/bundles/jammy-yoga.yaml rename to src/tests/bundles/jammy-antelope.yaml index c504a98..b3968f9 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-antelope local_overlay_enabled: False @@ -10,8 +10,10 @@ applications: vault: charm: ch:vault num_units: 1 + # The vault raft support is currently only available for jammy + series: jammy channel: latest/edge - + ovn-central: charm: ch:ovn-central num_units: 3 @@ -20,7 +22,7 @@ applications: channel: latest/edge ovn-dedicated-chassis: - charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 2 options: source: *openstack-origin diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml index 5ad92ef..0d5f8ac 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -22,7 +22,7 @@ applications: channel: latest/edge ovn-dedicated-chassis: - charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 2 options: source: *openstack-origin diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/lunar-antelope.yaml similarity index 92% rename from src/tests/bundles/kinetic-zed.yaml rename to src/tests/bundles/lunar-antelope.yaml index e5a3fd4..fe65e9f 100644 --- a/src/tests/bundles/kinetic-zed.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: kinetic +series: lunar applications: @@ -13,7 +13,7 @@ applications: # The vault raft support is currently only available for jammy series: jammy channel: latest/edge - + ovn-central: charm: ch:ovn-central num_units: 3 @@ -22,7 +22,7 @@ applications: channel: latest/edge ovn-dedicated-chassis: - charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 2 options: source: *openstack-origin diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 373bc1e..48cf650 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,15 +1,15 @@ charm_name: ovn-dedicated-chassis gate_bundles: -- jammy-yoga +- jammy-zed smoke_bundles: -- jammy-yoga +- jammy-zed dev_bundles: -- jammy-yoga - jammy-zed -- kinetic-zed +- jammy-antelope +- lunar-antelope target_deploy_status: ovn-central: @@ -31,4 +31,4 @@ tests: tests_options: force_deploy: - - kinetic-zed + - lunar-antelope