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: I5d4f5b0feac8d0efd4967ec5b6884ecc817c9f6b
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent f84af75285
commit 222273fd1f
7 changed files with 58 additions and 70 deletions

View File

@ -22,9 +22,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]

View File

@ -8,11 +8,9 @@ description: |
OS image which contains Docker and Kubernetes and runs that image in either virtual
machines or bare metal in a cluster configuration.
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
shared-db:

View File

@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@ -131,11 +131,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
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -156,7 +156,7 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
relations:

View File

@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@ -131,11 +131,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
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -156,7 +156,7 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
relations:

View File

@ -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'
@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@ -131,11 +131,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
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -156,7 +156,7 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
relations:

View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: True
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@ -131,11 +131,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
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -156,7 +156,7 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
relations:

View File

@ -1,23 +1,20 @@
charm_name: magnum
smoke_bundles:
- jammy-antelope
- jammy-caracal
gate_bundles:
- jammy-antelope
- jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- noble-caracal
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
# NOTE(lourot): don't exist in zaza-openstack-tests yet. Disabling for now in
# order to make the gate green:
#- zaza.openstack.charm_tests.heat.setup.domain_setup
@ -25,7 +22,7 @@ configure:
#- zaza.openstack.charm_tests.magnum.setup.add_image
tests:
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
# NOTE(lourot): doesn't exist in zaza-openstack-tests yet. Disabling for now in
# order to make the gate green:
#- zaza.openstack.charm_tests.magnum.tests.MagnumBasicDeployment
@ -37,5 +34,4 @@ target_deploy_status:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal