From ff2fb55d20d5ff4cc33df33e52bacd92e9242f8d 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: I319489688138911b6b77bdb7b3560bc3071e8e08 --- charmcraft.yaml | 64 ------------------- osci.yaml | 2 +- src/metadata.yaml | 12 ++-- src/tests/bundles/jammy-antelope.yaml | 4 +- src/tests/bundles/jammy-bobcat.yaml | 4 +- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 10 +-- ...lunar-antelope.yaml => noble-caracal.yaml} | 8 +-- src/tests/tests.yaml | 15 ++--- src/tox.ini | 4 +- tox.ini | 12 +++- 10 files changed, 38 insertions(+), 97 deletions(-) rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (89%) rename src/tests/bundles/{lunar-antelope.yaml => noble-caracal.yaml} (92%) diff --git a/charmcraft.yaml b/charmcraft.yaml index ac7b9e8..fc8d0b4 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -53,67 +53,3 @@ bases: - name: ubuntu channel: "22.04" architectures: [arm64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [s390x] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [s390x] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [ppc64el] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [ppc64el] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [arm64] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [arm64] diff --git a/osci.yaml b/osci.yaml index c779036..22a8fee 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: cinder-purestorage build_type: charmcraft - charmcraft_channel: 2.x/edge + charmcraft_channel: 2.x/stable diff --git a/src/metadata.yaml b/src/metadata.yaml index ea702ad..6e21616 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -6,14 +6,12 @@ description: | . This charm provides a purestorage backend for Cinder tags: -- openstack -- storage -- file-servers -- misc + - openstack + - storage + - file-servers + - misc series: -- jammy -- lunar -- mantic + - jammy subordinate: true provides: storage-backend: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index e899305..8578359 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -63,7 +63,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge cinder: charm: ch:cinder num_units: 1 @@ -71,7 +71,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge cinder-purestorage: charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 3a2a9f6..a769369 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -63,7 +63,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge cinder: charm: ch:cinder num_units: 1 @@ -71,7 +71,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge cinder-purestorage: charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 89% rename from src/tests/bundles/mantic-bobcat.yaml rename to src/tests/bundles/jammy-caracal.yaml index 5123c17..788f711 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' @@ -63,7 +63,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge cinder: charm: ch:cinder num_units: 1 @@ -71,9 +71,9 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-23.10-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml similarity index 92% rename from src/tests/bundles/lunar-antelope.yaml rename to src/tests/bundles/noble-caracal.yaml index 1d0689d..b975bc0 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' @@ -63,7 +63,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: latest/edge + channel: 2024.1/edge cinder: charm: ch:cinder num_units: 1 @@ -71,9 +71,9 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: latest/edge + channel: 2024.1/edge cinder-purestorage: - charm: ../../../cinder-purestorage_ubuntu-23.04-amd64.charm + charm: ../../../cinder-purestorage_ubuntu-22.04-amd64.charm options: # Add config options here driver-source: ppa:openstack-charmers/purestorage-stable diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4b17f86..6d79a73 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -6,14 +6,13 @@ tests: configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user gate_bundles: - - focal-xena -smoke_bundles: - - focal-xena -dev_bundles: - - focal-yoga - - jammy-yoga + - jammy-antelope - jammy-bobcat - - mantic-bobcat + - jammy-caracal +smoke_bundles: + - jammy-caracal +dev_bundles: + - noble-caracal tests_options: force_deploy: - - jammy-yoga + - 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 3cc17f9..00a2950 100644 --- a/tox.ini +++ b/tox.ini @@ -60,12 +60,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] @@ -78,7 +82,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}