From 002bfbc7a0bcf0956edb4d6e7bee5ef7bcde865e Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 9 Feb 2024 18:15:47 +0000 Subject: [PATCH] Updates for caracal testing support These updates, on the master branch, are to support testing the caracal packages and support of the charms for caracal. They do NOT lock the charms down, and don't change the testing branches to stable branches. Change-Id: Icb647aa0a11dd94c8397c5d371e5dfbc8a282294 --- charmcraft.yaml | 6 ----- metadata.yaml | 2 -- osci.yaml | 2 +- tests/bundles/jammy-antelope.yaml | 18 +++++++-------- tests/bundles/jammy-bobcat.yaml | 18 +++++++-------- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 22 +++++++++---------- ...lunar-antelope.yaml => noble-caracal.yaml} | 20 ++++++++--------- tests/tests.yaml | 16 +++++--------- 8 files changed, 45 insertions(+), 59 deletions(-) rename tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (94%) rename tests/bundles/{lunar-antelope.yaml => noble-caracal.yaml} (95%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 9a9ac47..652ab74 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -29,9 +29,3 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "23.04" - architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "23.10" - architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index 4f26830..7d7fc8e 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,8 +17,6 @@ tags: - file-servers series: - jammy - - lunar - - mantic subordinate: true provides: manila-plugin: diff --git a/osci.yaml b/osci.yaml index b76871f..e047d95 100644 --- a/osci.yaml +++ b/osci.yaml @@ -9,5 +9,5 @@ needs_charm_build: true charm_build_name: manila-netapp build_type: charmcraft - charmcraft_channel: 2.1/stable + charmcraft_channel: 2.x/stable diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml index 504b7c4..500a743 100644 --- a/tests/bundles/jammy-antelope.yaml +++ b/tests/bundles/jammy-antelope.yaml @@ -67,7 +67,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -76,7 +76,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -89,11 +89,11 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -128,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge manila: charm: ch:manila @@ -151,7 +151,7 @@ applications: default-share-backend: netapp-ontap to: - '12' - channel: latest/edge + channel: 2024.1/edge manila-netapp: charm: ../../manila-netapp.charm diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml index b6bacaf..872772b 100644 --- a/tests/bundles/jammy-bobcat.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -67,7 +67,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -76,7 +76,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -89,11 +89,11 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -128,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge manila: charm: ch:manila @@ -151,7 +151,7 @@ applications: default-share-backend: netapp-ontap to: - '12' - channel: latest/edge + channel: 2024.1/edge manila-netapp: charm: ../../manila-netapp.charm diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/jammy-caracal.yaml similarity index 94% rename from tests/bundles/mantic-bobcat.yaml rename to tests/bundles/jammy-caracal.yaml index 6c207a5..226310e 100644 --- a/tests/bundles/mantic-bobcat.yaml +++ b/tests/bundles/jammy-caracal.yaml @@ -1,9 +1,9 @@ variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-caracal local_overlay_enabled: True -series: mantic +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -67,7 +67,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -76,7 +76,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -89,11 +89,11 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -128,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge manila: charm: ch:manila @@ -151,7 +151,7 @@ applications: default-share-backend: netapp-ontap to: - '12' - channel: latest/edge + channel: 2024.1/edge manila-netapp: charm: ../../manila-netapp.charm diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/noble-caracal.yaml similarity index 95% rename from tests/bundles/lunar-antelope.yaml rename to tests/bundles/noble-caracal.yaml index ebe9725..000db5d 100644 --- a/tests/bundles/lunar-antelope.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: True -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -67,7 +67,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -76,7 +76,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -89,11 +89,11 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -128,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge manila: charm: ch:manila @@ -151,7 +151,7 @@ applications: default-share-backend: netapp-ontap to: - '12' - channel: latest/edge + channel: 2024.1/edge manila-netapp: charm: ../../manila-netapp.charm diff --git a/tests/tests.yaml b/tests/tests.yaml index 8a3cf4b..1386fa2 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -2,17 +2,12 @@ charm_name: manila-netapp gate_bundles: - jammy-antelope - -dev_bundles: - jammy-bobcat - - lunar-antelope - - mantic-bobcat - -# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See -# rationale there. + - jammy-caracal +dev_bundles: + - noble-caracal smoke_bundles: - - jammy-antelope - + - jammy-caracal target_deploy_status: {} configure: @@ -31,6 +26,5 @@ tests: tests_options: force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-caracal