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: Ieafb0f3ebb512c63aa3deac4dbbfffad5730b2f3
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 28003a9edd
commit 2601ad6108
9 changed files with 87 additions and 91 deletions

View File

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

@ -8,8 +8,6 @@ tags:
- networking - networking
series: series:
- jammy - jammy
- lunar
- mantic
subordinate: true subordinate: true
provides: provides:
neutron-plugin-api-subordinate: neutron-plugin-api-subordinate:

View File

@ -177,7 +177,7 @@ services:
worker-multiplier: 0.25 worker-multiplier: 0.25
storage: storage:
block-devices: cinder,50G block-devices: cinder,50G
channel: latest/edge channel: 2024.1/edge
ceph-radosgw: ceph-radosgw:
charm: ch:ceph-radosgw charm: ch:ceph-radosgw
num_units: 1 num_units: 1
@ -185,7 +185,7 @@ services:
options: options:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
channel: latest/edge channel: reef/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
num_units: 3 num_units: 3
@ -193,7 +193,7 @@ services:
options: options:
expected-osd-count: 3 expected-osd-count: 3
source: *source source: *source
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
num_units: 3 num_units: 3
@ -202,7 +202,7 @@ services:
source: *source source: *source
storage: storage:
osd-devices: 'cinder,30G' osd-devices: 'cinder,30G'
channel: latest/edge channel: reef/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
@ -210,7 +210,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
num_units: 1 num_units: 1
@ -218,7 +218,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
num_units: 1 num_units: 1
@ -229,7 +229,7 @@ services:
openstack-origin: *source openstack-origin: *source
manage-neutron-plugin-legacy-mode: false manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
num_units: 1 num_units: 1
@ -239,7 +239,7 @@ services:
enable-isolated-metadata: true enable-isolated-metadata: true
enable-metadata-network: true enable-metadata-network: true
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
num_units: 1 num_units: 1
@ -248,7 +248,7 @@ services:
network-manager: Neutron network-manager: Neutron
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
nova-ironic: nova-ironic:
charm: ch:nova-compute charm: ch:nova-compute
num_units: 1 num_units: 1
@ -258,7 +258,7 @@ services:
enable-resize: false enable-resize: false
openstack-origin: *source openstack-origin: *source
virt-type: ironic virt-type: ironic
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
num_units: 1 num_units: 1
@ -266,7 +266,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
@ -282,7 +282,7 @@ services:
constraints: mem=2G constraints: mem=2G
options: options:
openstack-origin: *source openstack-origin: *source
channel: latest/edge channel: 2024.1/edge
ironic-conductor: ironic-conductor:
charm: ch:ironic-conductor charm: ch:ironic-conductor
num_units: 1 num_units: 1
@ -293,13 +293,13 @@ services:
disable-secure-erase: true disable-secure-erase: true
use-ipxe: true use-ipxe: true
enabled-network-interfaces: "flat, noop" enabled-network-interfaces: "flat, noop"
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
options: options:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
neutron-ironic-agent: neutron-ironic-agent:
charm: ../../../neutron-api-plugin-ironic.charm charm: ../../../neutron-api-plugin-ironic.charm
num_units: 0 num_units: 0

View File

@ -177,7 +177,7 @@ services:
worker-multiplier: 0.25 worker-multiplier: 0.25
storage: storage:
block-devices: cinder,50G block-devices: cinder,50G
channel: latest/edge channel: 2024.1/edge
ceph-radosgw: ceph-radosgw:
charm: ch:ceph-radosgw charm: ch:ceph-radosgw
num_units: 1 num_units: 1
@ -185,7 +185,7 @@ services:
options: options:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
channel: latest/edge channel: reef/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
num_units: 3 num_units: 3
@ -193,7 +193,7 @@ services:
options: options:
expected-osd-count: 3 expected-osd-count: 3
source: *source source: *source
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
num_units: 3 num_units: 3
@ -202,7 +202,7 @@ services:
source: *source source: *source
storage: storage:
osd-devices: 'cinder,30G' osd-devices: 'cinder,30G'
channel: latest/edge channel: reef/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
@ -210,7 +210,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
num_units: 1 num_units: 1
@ -218,7 +218,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
num_units: 1 num_units: 1
@ -229,7 +229,7 @@ services:
openstack-origin: *source openstack-origin: *source
manage-neutron-plugin-legacy-mode: false manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
num_units: 1 num_units: 1
@ -239,7 +239,7 @@ services:
enable-isolated-metadata: true enable-isolated-metadata: true
enable-metadata-network: true enable-metadata-network: true
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
num_units: 1 num_units: 1
@ -248,7 +248,7 @@ services:
network-manager: Neutron network-manager: Neutron
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
nova-ironic: nova-ironic:
charm: ch:nova-compute charm: ch:nova-compute
num_units: 1 num_units: 1
@ -258,7 +258,7 @@ services:
enable-resize: false enable-resize: false
openstack-origin: *source openstack-origin: *source
virt-type: ironic virt-type: ironic
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
num_units: 1 num_units: 1
@ -266,7 +266,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
@ -282,7 +282,7 @@ services:
constraints: mem=2G constraints: mem=2G
options: options:
openstack-origin: *source openstack-origin: *source
channel: latest/edge channel: 2024.1/edge
ironic-conductor: ironic-conductor:
charm: ch:ironic-conductor charm: ch:ironic-conductor
num_units: 1 num_units: 1
@ -293,13 +293,13 @@ services:
disable-secure-erase: true disable-secure-erase: true
use-ipxe: true use-ipxe: true
enabled-network-interfaces: "flat, noop" enabled-network-interfaces: "flat, noop"
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
options: options:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
neutron-ironic-agent: neutron-ironic-agent:
charm: ../../../neutron-api-plugin-ironic.charm charm: ../../../neutron-api-plugin-ironic.charm
num_units: 0 num_units: 0

View File

@ -1,6 +1,6 @@
options: options:
source: &source distro source: &source cloud:jammy-caracal
series: mantic series: jammy
local_overlay_enabled: false local_overlay_enabled: false
relations: relations:
- - nova-ironic - - nova-ironic
@ -177,7 +177,7 @@ services:
worker-multiplier: 0.25 worker-multiplier: 0.25
storage: storage:
block-devices: cinder,50G block-devices: cinder,50G
channel: latest/edge channel: 2024.1/edge
ceph-radosgw: ceph-radosgw:
charm: ch:ceph-radosgw charm: ch:ceph-radosgw
num_units: 1 num_units: 1
@ -185,7 +185,7 @@ services:
options: options:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
channel: latest/edge channel: reef/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
num_units: 3 num_units: 3
@ -193,7 +193,7 @@ services:
options: options:
expected-osd-count: 3 expected-osd-count: 3
source: *source source: *source
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
num_units: 3 num_units: 3
@ -202,7 +202,7 @@ services:
source: *source source: *source
storage: storage:
osd-devices: 'cinder,30G' osd-devices: 'cinder,30G'
channel: latest/edge channel: reef/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
@ -210,7 +210,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
num_units: 1 num_units: 1
@ -218,7 +218,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
num_units: 1 num_units: 1
@ -229,7 +229,7 @@ services:
openstack-origin: *source openstack-origin: *source
manage-neutron-plugin-legacy-mode: false manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
num_units: 1 num_units: 1
@ -239,7 +239,7 @@ services:
enable-isolated-metadata: true enable-isolated-metadata: true
enable-metadata-network: true enable-metadata-network: true
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
num_units: 1 num_units: 1
@ -248,7 +248,7 @@ services:
network-manager: Neutron network-manager: Neutron
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
nova-ironic: nova-ironic:
charm: ch:nova-compute charm: ch:nova-compute
num_units: 1 num_units: 1
@ -258,7 +258,7 @@ services:
enable-resize: false enable-resize: false
openstack-origin: *source openstack-origin: *source
virt-type: ironic virt-type: ironic
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
num_units: 1 num_units: 1
@ -266,7 +266,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
@ -282,7 +282,7 @@ services:
constraints: mem=2G constraints: mem=2G
options: options:
openstack-origin: *source openstack-origin: *source
channel: latest/edge channel: 2024.1/edge
ironic-conductor: ironic-conductor:
charm: ch:ironic-conductor charm: ch:ironic-conductor
num_units: 1 num_units: 1
@ -293,13 +293,13 @@ services:
disable-secure-erase: true disable-secure-erase: true
use-ipxe: true use-ipxe: true
enabled-network-interfaces: "flat, noop" enabled-network-interfaces: "flat, noop"
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
options: options:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
neutron-ironic-agent: neutron-ironic-agent:
charm: ../../../neutron-api-plugin-ironic.charm charm: ../../../neutron-api-plugin-ironic.charm
num_units: 0 num_units: 0

View File

@ -1,6 +1,6 @@
options: options:
source: &source distro source: &source distro
series: lunar series: noble
local_overlay_enabled: false local_overlay_enabled: false
relations: relations:
- - nova-ironic - - nova-ironic
@ -177,7 +177,7 @@ services:
worker-multiplier: 0.25 worker-multiplier: 0.25
storage: storage:
block-devices: cinder,50G block-devices: cinder,50G
channel: latest/edge channel: 2024.1/edge
ceph-radosgw: ceph-radosgw:
charm: ch:ceph-radosgw charm: ch:ceph-radosgw
num_units: 1 num_units: 1
@ -185,7 +185,7 @@ services:
options: options:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
channel: latest/edge channel: reef/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
num_units: 3 num_units: 3
@ -193,7 +193,7 @@ services:
options: options:
expected-osd-count: 3 expected-osd-count: 3
source: *source source: *source
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
num_units: 3 num_units: 3
@ -202,7 +202,7 @@ services:
source: *source source: *source
storage: storage:
osd-devices: 'cinder,30G' osd-devices: 'cinder,30G'
channel: latest/edge channel: reef/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
@ -210,7 +210,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
num_units: 1 num_units: 1
@ -218,7 +218,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
num_units: 1 num_units: 1
@ -229,7 +229,7 @@ services:
openstack-origin: *source openstack-origin: *source
manage-neutron-plugin-legacy-mode: false manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
num_units: 1 num_units: 1
@ -239,7 +239,7 @@ services:
enable-isolated-metadata: true enable-isolated-metadata: true
enable-metadata-network: true enable-metadata-network: true
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
num_units: 1 num_units: 1
@ -248,7 +248,7 @@ services:
network-manager: Neutron network-manager: Neutron
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
nova-ironic: nova-ironic:
charm: ch:nova-compute charm: ch:nova-compute
num_units: 1 num_units: 1
@ -258,7 +258,7 @@ services:
enable-resize: false enable-resize: false
openstack-origin: *source openstack-origin: *source
virt-type: ironic virt-type: ironic
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
num_units: 1 num_units: 1
@ -266,7 +266,7 @@ services:
options: options:
openstack-origin: *source openstack-origin: *source
worker-multiplier: 0.25 worker-multiplier: 0.25
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
@ -282,7 +282,7 @@ services:
constraints: mem=2G constraints: mem=2G
options: options:
openstack-origin: *source openstack-origin: *source
channel: latest/edge channel: 2024.1/edge
ironic-conductor: ironic-conductor:
charm: ch:ironic-conductor charm: ch:ironic-conductor
num_units: 1 num_units: 1
@ -293,13 +293,13 @@ services:
disable-secure-erase: true disable-secure-erase: true
use-ipxe: true use-ipxe: true
enabled-network-interfaces: "flat, noop" enabled-network-interfaces: "flat, noop"
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
options: options:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
channel: latest/edge channel: 2024.1/edge
neutron-ironic-agent: neutron-ironic-agent:
charm: ../../../neutron-api-plugin-ironic.charm charm: ../../../neutron-api-plugin-ironic.charm
num_units: 0 num_units: 0

View File

@ -5,15 +5,12 @@ charm_name: ironic-api
gate_bundles: gate_bundles:
- jammy-antelope - jammy-antelope
dev_bundles:
- jammy-bobcat - jammy-bobcat
- lunar-antelope - jammy-caracal
- mantic-bobcat dev_bundles:
- noble-caracal
smoke_bundles: smoke_bundles:
- jammy-antelope - jammy-caracal
target_deploy_status: target_deploy_status:
vault: vault:
workload-status: blocked workload-status: blocked
@ -43,5 +40,4 @@ tests:
tests_options: tests_options:
force_deploy: force_deploy:
- lunar-antelope - noble-caracal
- mantic-bobcat

View File

@ -25,7 +25,9 @@ passenv =
CS_* CS_*
OS_* OS_*
TEST_* TEST_*
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3

12
tox.ini
View File

@ -61,12 +61,16 @@ commands =
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
@ -79,7 +83,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon # Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}