From 052d651226d33d5d3f34c8a6ea9c738356c0585b Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 9 Feb 2024 18:15:47 +0000 Subject: [PATCH] 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: Iffc97e7963469742439da25040e204fd27000976 --- charmcraft.yaml | 6 ------ src/metadata.yaml | 6 ++---- src/tests/bundles/jammy-antelope.yaml | 16 +++++++-------- src/tests/bundles/jammy-bobcat.yaml | 16 +++++++-------- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 20 +++++++++---------- ...lunar-antelope.yaml => noble-caracal.yaml} | 18 ++++++++--------- src/tests/tests.yaml | 14 +++++-------- src/tox.ini | 4 +++- tox.ini | 12 ++++++++--- 9 files changed, 54 insertions(+), 58 deletions(-) rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (96%) rename src/tests/bundles/{lunar-antelope.yaml => noble-caracal.yaml} (96%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 2df13f1..c31dea1 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -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] diff --git a/src/metadata.yaml b/src/metadata.yaml index 51b0464..e26b520 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -19,11 +19,9 @@ description: | See usage guidance as published in the charm deployment guide: * https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/app-nova-cells.html tags: -- openstack + - openstack series: -- jammy -- lunar -- mantic + - jammy extra-bindings: public: admin: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 3fe9710..f272765 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -87,7 +87,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -98,7 +98,7 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -112,7 +112,7 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -123,12 +123,12 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-cell-controller-cell2: charm: ../../../nova-cell-controller.charm @@ -166,7 +166,7 @@ applications: debug: true to: - '12' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server-nova: charm: ch:rabbitmq-server @@ -197,7 +197,7 @@ applications: debug: true to: - '16' - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 39cbd53..6662548 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -87,7 +87,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -98,7 +98,7 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -112,7 +112,7 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -123,12 +123,12 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-cell-controller-cell2: charm: ../../../nova-cell-controller.charm @@ -166,7 +166,7 @@ applications: debug: true to: - '12' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server-nova: charm: ch:rabbitmq-server @@ -197,7 +197,7 @@ applications: debug: true to: - '16' - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 96% rename from src/tests/bundles/mantic-bobcat.yaml rename to src/tests/bundles/jammy-caracal.yaml index b8f14b0..27bdeca 100644 --- a/src/tests/bundles/mantic-bobcat.yaml +++ b/src/tests/bundles/jammy-caracal.yaml @@ -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' @@ -87,7 +87,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -98,7 +98,7 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -112,7 +112,7 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -123,12 +123,12 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-cell-controller-cell2: charm: ../../../nova-cell-controller.charm @@ -166,7 +166,7 @@ applications: debug: true to: - '12' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server-nova: charm: ch:rabbitmq-server @@ -197,7 +197,7 @@ applications: debug: true to: - '16' - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml similarity index 96% rename from src/tests/bundles/lunar-antelope.yaml rename to src/tests/bundles/noble-caracal.yaml index 0b86845..c9b16b7 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -87,7 +87,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -98,7 +98,7 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -112,7 +112,7 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -123,12 +123,12 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: latest/edge + channel: 2024.1/edge nova-cell-controller-cell2: charm: ../../../nova-cell-controller.charm @@ -166,7 +166,7 @@ applications: debug: true to: - '12' - channel: latest/edge + channel: 2024.1/edge rabbitmq-server-nova: charm: ch:rabbitmq-server @@ -197,7 +197,7 @@ applications: debug: true to: - '16' - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index f92e543..434a67c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -12,16 +12,12 @@ configure: gate_bundles: - jammy-antelope - -dev_bundles: - jammy-bobcat - - lunar-antelope - - mantic-bobcat - + - jammy-caracal +dev_bundles: + - noble-caracal smoke_bundles: - - jammy-antelope - + - jammy-caracal tests_options: force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-caracal diff --git a/src/tox.ini b/src/tox.ini index 8ffff0f..2ddcccd 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -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 diff --git a/tox.ini b/tox.ini index c11375e..3e44bd9 100644 --- a/tox.ini +++ b/tox.ini @@ -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}