From e367acdb05b38ecd73f5f0ca13c12d4393a0d834 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: I5d4f5b0feac8d0efd4967ec5b6884ecc817c9f6b --- charmcraft.yaml | 6 ---- src/metadata.yaml | 6 ++-- src/tests/bundles/jammy-antelope.yaml | 20 ++++++------- src/tests/bundles/jammy-bobcat.yaml | 20 ++++++------- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 24 +++++++-------- ...lunar-antelope.yaml => noble-caracal.yaml} | 22 +++++++------- src/tests/tests.yaml | 30 ++++++++----------- src/tox.ini | 4 ++- tox.ini | 12 ++++++-- 9 files changed, 70 insertions(+), 74 deletions(-) rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (95%) 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 1653c74..0503214 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,11 +8,9 @@ description: | OS image which contains Docker and Kubernetes and runs that image in either virtual machines or bare metal in a cluster configuration. tags: -- openstack + - openstack series: -- jammy -- lunar -- mantic + - jammy subordinate: false requires: shared-db: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 85d44d8..1e0b33b 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -90,7 +90,7 @@ applications: network-manager: Neutron to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -103,7 +103,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -122,7 +122,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -144,7 +144,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -156,7 +156,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge vault: charm: ch:vault @@ -190,7 +190,7 @@ applications: openstack-origin: *openstack-origin to: - '16' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -199,7 +199,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - 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 2597b8e..5e1874e 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -90,7 +90,7 @@ applications: network-manager: Neutron to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -103,7 +103,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -122,7 +122,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -144,7 +144,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -156,7 +156,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge vault: charm: ch:vault @@ -190,7 +190,7 @@ applications: openstack-origin: *openstack-origin to: - '16' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -199,7 +199,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - 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 95% rename from src/tests/bundles/mantic-bobcat.yaml rename to src/tests/bundles/jammy-caracal.yaml index eb72253..ac73be4 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: True -series: mantic +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -90,7 +90,7 @@ applications: network-manager: Neutron to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -103,7 +103,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -122,7 +122,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -144,7 +144,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -156,7 +156,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge vault: charm: ch:vault @@ -190,7 +190,7 @@ applications: openstack-origin: *openstack-origin to: - '16' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -199,7 +199,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - 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 0804edd..9ac8392 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: True -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -90,7 +90,7 @@ applications: network-manager: Neutron to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -103,7 +103,7 @@ applications: neutron-security-groups: true to: - '5' - channel: latest/edge + channel: 2024.1/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: 2024.1/edge neutron-gateway: charm: ch:neutron-gateway @@ -122,7 +122,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -144,7 +144,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -156,7 +156,7 @@ applications: to: - '10' - '11' - channel: latest/edge + channel: 2024.1/edge vault: charm: ch:vault @@ -190,7 +190,7 @@ applications: openstack-origin: *openstack-origin to: - '16' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -199,7 +199,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 91e798d..9ae8058 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,23 +1,20 @@ charm_name: magnum smoke_bundles: -- jammy-antelope - + - jammy-caracal gate_bundles: -- jammy-antelope - + - jammy-antelope + - jammy-bobcat + - jammy-caracal dev_bundles: -- jammy-bobcat -- lunar-antelope -- mantic-bobcat - + - noble-caracal configure: -- zaza.openstack.charm_tests.vault.setup.auto_initialize -- zaza.openstack.charm_tests.glance.setup.add_cirros_image -- zaza.openstack.charm_tests.keystone.setup.add_demo_user -- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network -- zaza.openstack.charm_tests.nova.setup.create_flavors -- zaza.openstack.charm_tests.nova.setup.manage_ssh_key + - zaza.openstack.charm_tests.vault.setup.auto_initialize + - zaza.openstack.charm_tests.glance.setup.add_cirros_image + - zaza.openstack.charm_tests.keystone.setup.add_demo_user + - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network + - zaza.openstack.charm_tests.nova.setup.create_flavors + - zaza.openstack.charm_tests.nova.setup.manage_ssh_key # NOTE(lourot): don't exist in zaza-openstack-tests yet. Disabling for now in # order to make the gate green: #- zaza.openstack.charm_tests.heat.setup.domain_setup @@ -25,7 +22,7 @@ configure: #- zaza.openstack.charm_tests.magnum.setup.add_image 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 # order to make the gate green: #- zaza.openstack.charm_tests.magnum.tests.MagnumBasicDeployment @@ -37,5 +34,4 @@ target_deploy_status: 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}