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

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

src/metadata.yaml

@@ -2,9 +2,9 @@ name: cinder-netapp
 summary: netapp integration for OpenStack Block Storage
 maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 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:

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:

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:

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:

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:

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

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

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