openstack/charm-magnum
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: I5d4f5b0feac8d0efd4967ec5b6884ecc817c9f6b
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent f84af75285
commit e367acdb05
9 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

6
src/metadata.yaml
View File

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

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

@ -90,7 +90,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -103,7 +103,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
@ -112,7 +112,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
@ -122,7 +122,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
@ -131,11 +131,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
@ -144,7 +144,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
@ -156,7 +156,7 @@ applications:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: 2024.1/edge
vault: vault:
charm: ch:vault charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: latest/edge channel: 2024.1/edge
barbican: barbican:
charm: ch:barbican charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
relations: relations:

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

@ -90,7 +90,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -103,7 +103,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
@ -112,7 +112,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
@ -122,7 +122,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
@ -131,11 +131,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
@ -144,7 +144,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
@ -156,7 +156,7 @@ applications:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: 2024.1/edge
vault: vault:
charm: ch:vault charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: latest/edge channel: 2024.1/edge
barbican: barbican:
charm: ch:barbican charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
relations: relations:

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

@ -1,9 +1,9 @@
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: True local_overlay_enabled: True
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'
@ -90,7 +90,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -103,7 +103,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
@ -112,7 +112,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
@ -122,7 +122,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
@ -131,11 +131,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
@ -144,7 +144,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
@ -156,7 +156,7 @@ applications:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: 2024.1/edge
vault: vault:
charm: ch:vault charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: latest/edge channel: 2024.1/edge
barbican: barbican:
charm: ch:barbican charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
relations: relations:

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

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: True local_overlay_enabled: True
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'
@ -90,7 +90,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -103,7 +103,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
@ -112,7 +112,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
@ -122,7 +122,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
@ -131,11 +131,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
@ -144,7 +144,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
@ -156,7 +156,7 @@ applications:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: 2024.1/edge
vault: vault:
charm: ch:vault charm: ch:vault
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: latest/edge channel: 2024.1/edge
barbican: barbican:
charm: ch:barbican charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
relations: relations:

30
src/tests/tests.yaml
View File

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

4
src/tox.ini
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}