From 6ba683d23e7cb5e3c652213647e9abe75646930f 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: I1d277dfe9b80d550b83eb9e4814cf43b4e55bf30 --- charmcraft.yaml | 6 ------ src/metadata.yaml | 6 ++---- src/tests/bundles/jammy-antelope.yaml | 14 +++++++------- src/tests/bundles/jammy-bobcat.yaml | 14 +++++++------- .../{mantic-bobcat.yaml => jammy-caracal.yaml} | 18 +++++++++--------- ...{lunar-antelope.yaml => noble-caracal.yaml} | 16 ++++++++-------- src/tests/tests.yaml | 16 ++++++---------- src/tox.ini | 4 +++- tox.ini | 12 +++++++++--- 9 files changed, 51 insertions(+), 55 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 7936b57..ab665cd 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -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: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 432994a..fad8940 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -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 diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 6287309..ecab556 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -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 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 077bbfe..f855e01 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' @@ -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 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 e0d1769..8f5aa52 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' @@ -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 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 97cc31d..93997e6 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -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 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}