openstack/charm-ironic-api
Code Issues Proposed changes

Updates for caracal testing support

Browse Source 
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: I4f82c0c93dfe1b0ba4fcfb74b4162566ce056e6b
This commit is contained in:
Alex Kavanagh
2024-02-09 18:15:47 +00:00
parent 285b880568
commit 0a986261eb
9 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
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]

8
src/metadata.yaml
View File

@@ -10,12 +10,10 @@ description: |
to provision and turn on/off machines, but Ironic also supports
vendor-specific plugins which may implement additional functionality.
tags:
- openstack
- baremetal
- openstack
- baremetal
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
shared-db:

28
src/tests/bundles/jammy-antelope.yaml
View File

@@ -182,7 +182,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@@ -190,7 +190,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@@ -198,7 +198,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@@ -207,7 +207,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@@ -223,7 +223,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@@ -234,7 +234,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@@ -244,7 +244,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@@ -253,7 +253,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@@ -263,7 +263,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@@ -271,7 +271,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@@ -297,19 +297,19 @@ services:
disable-secure-erase: true
use-ipxe: true
enabled-network-interfaces: "flat, noop"
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
options:
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
neutron-ironic-agent:
charm: ch:neutron-api-plugin-ironic
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

28
src/tests/bundles/jammy-bobcat.yaml
View File

@@ -182,7 +182,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@@ -190,7 +190,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@@ -198,7 +198,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@@ -207,7 +207,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@@ -223,7 +223,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@@ -234,7 +234,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@@ -244,7 +244,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@@ -253,7 +253,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@@ -263,7 +263,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@@ -271,7 +271,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@@ -297,19 +297,19 @@ services:
disable-secure-erase: true
use-ipxe: true
enabled-network-interfaces: "flat, noop"
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
options:
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
neutron-ironic-agent:
charm: ch:neutron-api-plugin-ironic
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

32
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@@ -1,8 +1,8 @@
local_overlay_enabled: False
options:
source: &source distro
series: mantic
source: &source cloud:jammy-caracal
series: jammy
relations:
- - nova-ironic
- ironic-api
@@ -182,7 +182,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@@ -190,7 +190,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@@ -198,7 +198,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@@ -207,7 +207,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@@ -223,7 +223,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@@ -234,7 +234,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@@ -244,7 +244,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@@ -253,7 +253,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@@ -263,7 +263,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@@ -271,7 +271,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@@ -297,19 +297,19 @@ services:
disable-secure-erase: true
use-ipxe: true
enabled-network-interfaces: "flat, noop"
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
options:
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
neutron-ironic-agent:
charm: ch:neutron-api-plugin-ironic
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

30
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@@ -2,7 +2,7 @@ local_overlay_enabled: False
options:
source: &source distro
series: lunar
series: noble
relations:
- - nova-ironic
- ironic-api
@@ -182,7 +182,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@@ -190,7 +190,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@@ -198,7 +198,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@@ -207,7 +207,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@@ -223,7 +223,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@@ -234,7 +234,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@@ -244,7 +244,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@@ -253,7 +253,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@@ -263,7 +263,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@@ -271,7 +271,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@@ -297,19 +297,19 @@ services:
disable-secure-erase: true
use-ipxe: true
enabled-network-interfaces: "flat, noop"
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
options:
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
neutron-ironic-agent:
charm: ch:neutron-api-plugin-ironic
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

30
src/tests/tests.yaml
View File

@@ -1,16 +1,13 @@
charm_name: ironic-api
gate_bundles:
- jammy-antelope
- jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- noble-caracal
smoke_bundles:
- jammy-antelope
- jammy-caracal
target_deploy_status:
vault:
workload-status: blocked
@@ -20,21 +17,20 @@ target_deploy_status:
workload-status-message-prefix: invalid enabled-deploy-interfaces config
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
- zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
- zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
- zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
- zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
- zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
- zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
# Ironic will require a flat network to test the flat network type. Once a proper
# testing environment will be available for Ironic, we will need to add the setup
# call to create that flat network
#- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
tests:
- zaza.openstack.charm_tests.ironic.tests.IronicTest
- zaza.openstack.charm_tests.ironic.tests.IronicTest
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal

4
src/tox.ini
View File

@@ -25,7 +25,9 @@ passenv =
CS_*
OS_*
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]
basepython = python3

12
tox.ini
View File

@@ -61,12 +61,16 @@ commands =
[testenv:py3]
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}
[testenv:py310]
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}
[testenv:pep8]
@@ -79,7 +83,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini
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
setenv =
{[testenv]setenv}