openstack/charm-placement
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: I1d277dfe9b80d550b83eb9e4814cf43b4e55bf30
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 7b34a3124e
commit 6ba683d23e
9 changed files with 51 additions and 55 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
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]

6
src/metadata.yaml
View File

@ -9,11 +9,9 @@ description: |
OpenStack Train or later is required.
docs: https://discourse.charmhub.io/t/placement-docs-index/10547
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
shared-db:

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

@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -83,7 +83,7 @@ applications:
admin-password: openstack
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -96,11 +96,11 @@ applications:
neutron-security-groups: true
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -110,7 +110,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -121,7 +121,7 @@ applications:
debug: true
to:
- '8'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -135,7 +135,7 @@ applications:
debug: true
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ../../../placement.charm

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

@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -83,7 +83,7 @@ applications:
admin-password: openstack
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -96,11 +96,11 @@ applications:
neutron-security-groups: true
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -110,7 +110,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -121,7 +121,7 @@ applications:
debug: true
to:
- '8'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -135,7 +135,7 @@ applications:
debug: true
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ../../../placement.charm

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

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: False
series: mantic
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -83,7 +83,7 @@ applications:
admin-password: openstack
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -96,11 +96,11 @@ applications:
neutron-security-groups: true
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -110,7 +110,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -121,7 +121,7 @@ applications:
debug: true
to:
- '8'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -135,7 +135,7 @@ applications:
debug: true
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ../../../placement.charm

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

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -83,7 +83,7 @@ applications:
admin-password: openstack
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -96,11 +96,11 @@ applications:
neutron-security-groups: true
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -110,7 +110,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -121,7 +121,7 @@ applications:
debug: true
to:
- '8'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -135,7 +135,7 @@ applications:
debug: true
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ../../../placement.charm

16
src/tests/tests.yaml
View File

@ -18,16 +18,12 @@ configure:
gate_bundles:
- jammy-antelope
smoke_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-caracal
smoke_bundles:
- jammy-caracal
dev_bundles:
- noble-caracal
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}