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

@@ -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]

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

src/metadata.yaml

@@ -6,14 +6,12 @@ description: |
   .
   This charm provides a purestorage backend for Cinder
 tags:
-- openstack
+  - openstack
-- storage
+  - storage
-- file-servers
+  - file-servers
-- misc
+  - misc
 series:
-- jammy
+  - jammy
-- lunar
-- mantic
 subordinate: true
 provides:
   storage-backend:

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:

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:

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

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

src/tests/tests.yaml

@@ -6,14 +6,13 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
-  - focal-xena
+  - jammy-antelope
-smoke_bundles:
-  - focal-xena
-dev_bundles:
-  - focal-yoga
-  - jammy-yoga
   - jammy-bobcat
-  - mantic-bobcat
+  - jammy-caracal
+smoke_bundles:
+  - jammy-caracal
+dev_bundles:
+  - noble-caracal
 tests_options:
   force_deploy:
-    - jammy-yoga
+    - noble-caracal

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

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}