From 342e72244fa205d3fb038b0cb2bd3f2f3eac0b5a 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: I5549fc5d72659dd3434543d13001101af3b613f2 --- charmcraft.yaml | 6 ------ src/metadata.yaml | 6 ++---- 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 | 17 ++++++++--------- src/tox.ini | 4 +++- tox.ini | 12 +++++++++--- 9 files changed, 33 insertions(+), 34 deletions(-) rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (94%) 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 0f49364..c48b221 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -3,11 +3,9 @@ summary: Vault backend for OpenStack Barbican maintainer: OpenStack Charmers description: Vault backend for OpenStack Barbican tags: -- openstack + - openstack series: -- jammy -- lunar -- mantic + - jammy subordinate: true provides: secrets: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 49c703d..bb1dcf0 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -51,7 +51,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -62,7 +62,7 @@ applications: - '4' - '5' - '6' - channel: latest/edge + channel: 2024.1/edge barbican-vault: charm: ../../../barbican-vault.charm diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 7e7e962..8725f06 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -51,7 +51,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -62,7 +62,7 @@ applications: - '4' - '5' - '6' - channel: latest/edge + channel: 2024.1/edge barbican-vault: charm: ../../../barbican-vault.charm diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 94% rename from src/tests/bundles/mantic-bobcat.yaml rename to src/tests/bundles/jammy-caracal.yaml index ceeb897..d6ea2f8 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' @@ -51,7 +51,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -62,7 +62,7 @@ applications: - '4' - '5' - '6' - channel: latest/edge + channel: 2024.1/edge barbican-vault: charm: ../../../barbican-vault.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 dc68135..a8f6422 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' @@ -51,7 +51,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge barbican: charm: ch:barbican @@ -62,7 +62,7 @@ applications: - '4' - '5' - '6' - channel: latest/edge + channel: 2024.1/edge barbican-vault: charm: ../../../barbican-vault.charm diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 575e7cb..b2142ce 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,12 +1,12 @@ charm_name: barbican-vault 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 target_deploy_status: barbican-vault: workload-status: waiting @@ -15,10 +15,9 @@ target_deploy_status: workload-status: blocked workload-status-message-prefix: Vault needs to be initialized configure: -- zaza.openstack.charm_tests.vault.setup.basic_setup + - zaza.openstack.charm_tests.vault.setup.basic_setup tests: -- zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault + - zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault 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}