From 3c262b857445e0eba281c70b5ab9546863312beb 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: I9052c3435f1cdefab4074bad633ff02e4b25bff4 --- charmcraft.yaml | 6 ------ metadata.yaml | 6 ++---- osci.yaml | 2 +- tests/bundles/jammy-antelope.yaml | 16 +++++++-------- tests/bundles/jammy-bobcat.yaml | 16 +++++++-------- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 20 +++++++++---------- ...lunar-antelope.yaml => noble-caracal.yaml} | 18 ++++++++--------- tests/tests.yaml | 14 +++++-------- 8 files changed, 43 insertions(+), 55 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 ef2e259..80e3451 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -6,11 +6,9 @@ description: | . This charm provides Nvidia vGPU support for Nova. tags: -- openstack + - openstack series: -- jammy -- lunar -- mantic + - jammy subordinate: true provides: nova-vgpu: diff --git a/osci.yaml b/osci.yaml index ce75fd6..8a5221a 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,6 +1,6 @@ - project: templates: - - charm-unit-jobs + - charm-unit-jobs-py310 - charm-functional-jobs vars: needs_charm_build: true diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml index 512acd5..27ab7bf 100644 --- a/tests/bundles/jammy-antelope.yaml +++ b/tests/bundles/jammy-antelope.yaml @@ -68,7 +68,7 @@ applications: debug: true to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -89,7 +89,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -99,7 +99,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -108,11 +108,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -121,7 +121,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -136,7 +136,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.charm diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml index db92f00..6b117df 100644 --- a/tests/bundles/jammy-bobcat.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -68,7 +68,7 @@ applications: debug: true to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -89,7 +89,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -99,7 +99,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -108,11 +108,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -121,7 +121,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -136,7 +136,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.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 a59d804..6f6336c 100644 --- a/tests/bundles/mantic-bobcat.yaml +++ b/tests/bundles/jammy-caracal.yaml @@ -1,9 +1,9 @@ local_overlay_enabled: False variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-caracal -series: mantic +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -68,7 +68,7 @@ applications: debug: true to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -89,7 +89,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -99,7 +99,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -108,11 +108,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -121,7 +121,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -136,7 +136,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.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 6c2158e..c4857c7 100644 --- a/tests/bundles/lunar-antelope.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -3,7 +3,7 @@ local_overlay_enabled: False variables: openstack-origin: &openstack-origin distro -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -68,7 +68,7 @@ applications: debug: true to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -89,7 +89,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -99,7 +99,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -108,11 +108,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -121,7 +121,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -136,7 +136,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.charm diff --git a/tests/tests.yaml b/tests/tests.yaml index b948d9a..7928228 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,16 +1,13 @@ charm_name: nova-compute-nvidia-vgpu smoke_bundles: - - jammy-antelope - + - jammy-caracal gate_bundles: - jammy-antelope - -dev_bundles: - jammy-bobcat - - lunar-antelope - - mantic-bobcat - + - jammy-caracal +dev_bundles: + - noble-caracal configure: - zaza.openstack.charm_tests.glance.setup.add_cirros_image - zaza.openstack.charm_tests.glance.setup.add_lts_image @@ -25,5 +22,4 @@ tests: tests_options: force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-caracal