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
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 9c4f136b9d
commit 3c262b8574
8 changed files with 43 additions and 55 deletions

View File

@ -29,9 +29,3 @@ bases:
- name: ubuntu - name: ubuntu
channel: "22.04" channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64] 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]

View File

@ -6,11 +6,9 @@ description: |
. .
This charm provides Nvidia vGPU support for Nova. This charm provides Nvidia vGPU support for Nova.
tags: tags:
- openstack - openstack
series: series:
- jammy - jammy
- lunar
- mantic
subordinate: true subordinate: true
provides: provides:
nova-vgpu: nova-vgpu:

View File

@ -1,6 +1,6 @@
- project: - project:
templates: templates:
- charm-unit-jobs - charm-unit-jobs-py310
- charm-functional-jobs - charm-functional-jobs
vars: vars:
needs_charm_build: true needs_charm_build: true

View File

@ -68,7 +68,7 @@ applications:
debug: true debug: true
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '5' - '5'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -89,7 +89,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '6' - '6'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -99,7 +99,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -108,11 +108,11 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -121,7 +121,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -136,7 +136,7 @@ applications:
debug: true debug: true
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute-nvidia-vgpu: nova-compute-nvidia-vgpu:
charm: ../../nova-compute-nvidia-vgpu.charm charm: ../../nova-compute-nvidia-vgpu.charm

View File

@ -68,7 +68,7 @@ applications:
debug: true debug: true
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '5' - '5'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -89,7 +89,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '6' - '6'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -99,7 +99,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -108,11 +108,11 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -121,7 +121,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -136,7 +136,7 @@ applications:
debug: true debug: true
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute-nvidia-vgpu: nova-compute-nvidia-vgpu:
charm: ../../nova-compute-nvidia-vgpu.charm charm: ../../nova-compute-nvidia-vgpu.charm

View File

@ -1,9 +1,9 @@
local_overlay_enabled: False local_overlay_enabled: False
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin cloud:jammy-caracal
series: mantic series: jammy
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -68,7 +68,7 @@ applications:
debug: true debug: true
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '5' - '5'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -89,7 +89,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '6' - '6'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -99,7 +99,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -108,11 +108,11 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -121,7 +121,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -136,7 +136,7 @@ applications:
debug: true debug: true
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute-nvidia-vgpu: nova-compute-nvidia-vgpu:
charm: ../../nova-compute-nvidia-vgpu.charm charm: ../../nova-compute-nvidia-vgpu.charm

View File

@ -3,7 +3,7 @@ local_overlay_enabled: False
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin distro
series: lunar series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -68,7 +68,7 @@ applications:
debug: true debug: true
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '5' - '5'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -89,7 +89,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '6' - '6'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -99,7 +99,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -108,11 +108,11 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -121,7 +121,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -136,7 +136,7 @@ applications:
debug: true debug: true
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute-nvidia-vgpu: nova-compute-nvidia-vgpu:
charm: ../../nova-compute-nvidia-vgpu.charm charm: ../../nova-compute-nvidia-vgpu.charm

View File

@ -1,16 +1,13 @@
charm_name: nova-compute-nvidia-vgpu charm_name: nova-compute-nvidia-vgpu
smoke_bundles: smoke_bundles:
- jammy-antelope - jammy-caracal
gate_bundles: gate_bundles:
- jammy-antelope - jammy-antelope
dev_bundles:
- jammy-bobcat - jammy-bobcat
- lunar-antelope - jammy-caracal
- mantic-bobcat dev_bundles:
- noble-caracal
configure: configure:
- zaza.openstack.charm_tests.glance.setup.add_cirros_image - zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.glance.setup.add_lts_image
@ -25,5 +22,4 @@ tests:
tests_options: tests_options:
force_deploy: force_deploy:
- lunar-antelope - noble-caracal
- mantic-bobcat