From 28e837705aa6db2ad510c5a504956c4feed9b4b6 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: Ie19480eae79a8c6576cd64324abc0e67df9a7ded --- charmcraft.yaml | 6 ------ src/metadata.yaml | 8 +++----- src/tests/bundles/jammy-antelope.yaml | 4 ++-- src/tests/bundles/jammy-bobcat.yaml | 4 ++-- .../{mantic-bobcat.yaml => jammy-caracal.yaml} | 8 ++++---- .../{lunar-antelope.yaml => noble-caracal.yaml} | 6 +++--- src/tests/tests.yaml | 15 ++++++++------- src/tox.ini | 4 +++- tox.ini | 12 +++++++++--- 9 files changed, 34 insertions(+), 33 deletions(-) rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (93%) 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 7280d27..bd78a8a 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -2,9 +2,9 @@ name: cinder-netapp summary: netapp integration for OpenStack Block Storage maintainer: OpenStack Charmers description: | - Cinder is the block storage service for the Openstack project. - . - This charm provides a netapp backend for Cinder + Cinder is the block storage service for the Openstack project. + . + This charm provides a netapp backend for Cinder tags: - openstack - storage @@ -12,8 +12,6 @@ tags: - misc series: - jammy - - lunar - - mantic subordinate: true provides: storage-backend: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index e3c71a9..c32eae5 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -55,7 +55,7 @@ applications: num_units: 1 to: - '4' - channel: latest/edge + channel: 2024.1/edge keystone-mysql-router: charm: ch:mysql-router channel: latest/edge @@ -70,7 +70,7 @@ applications: overwrite: "true" to: - '5' - channel: latest/edge + channel: 2024.1/edge cinder-netapp: charm: ../../../cinder-netapp.charm options: diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 8103ea4..4b3adcd 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -55,7 +55,7 @@ applications: num_units: 1 to: - '4' - channel: latest/edge + channel: 2024.1/edge keystone-mysql-router: charm: ch:mysql-router channel: latest/edge @@ -70,7 +70,7 @@ applications: overwrite: "true" to: - '5' - channel: latest/edge + channel: 2024.1/edge cinder-netapp: charm: ../../../cinder-netapp.charm options: diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 93% rename from src/tests/bundles/mantic-bobcat.yaml rename to src/tests/bundles/jammy-caracal.yaml index 2cac1fe..6559686 100644 --- a/src/tests/bundles/mantic-bobcat.yaml +++ b/src/tests/bundles/jammy-caracal.yaml @@ -1,8 +1,8 @@ -series: mantic +series: jammy local_overlay_enabled: False variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-caracal comment: - 'machines section to decide order of deployment. database sooner = faster' machines: @@ -55,7 +55,7 @@ applications: num_units: 1 to: - '4' - channel: latest/edge + channel: 2024.1/edge keystone-mysql-router: charm: ch:mysql-router channel: latest/edge @@ -70,7 +70,7 @@ applications: overwrite: "true" to: - '5' - channel: latest/edge + channel: 2024.1/edge cinder-netapp: charm: ../../../cinder-netapp.charm options: 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 1c301a8..f0b79e7 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -1,4 +1,4 @@ -series: lunar +series: noble local_overlay_enabled: False variables: @@ -55,7 +55,7 @@ applications: num_units: 1 to: - '4' - channel: latest/edge + channel: 2024.1/edge keystone-mysql-router: charm: ch:mysql-router channel: latest/edge @@ -70,7 +70,7 @@ applications: overwrite: "true" to: - '5' - channel: latest/edge + channel: 2024.1/edge cinder-netapp: charm: ../../../cinder-netapp.charm options: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index bdeb6ac..7b0abe4 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -5,13 +5,14 @@ configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user 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 test_options: force_deploy: - - lunar-antelope - - mantic-bobcat +tests_options: + force_deploy: + - 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}