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: Iab51a774517ee8bd397eb900bd76a0620aa3dd6d

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

@@ -14,11 +14,9 @@ description: |
   instance such that it can use the generic driver appropriately.
 docs: https://discourse.charmhub.io/t/manila-generic-docs-index/11094
 tags:
-- openstack
+  - openstack
 series:
-- jammy
-- lunar
-- mantic
+  - jammy
 subordinate: true
 provides:
   manila-plugin:

src/tests/bundles/jammy-antelope.yaml

@@ -46,7 +46,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   manila-generic:
     charm: ../../../manila-generic.charm
@@ -67,7 +67,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
   nrpe:
     charm: ch:nrpe
     channel: latest/edge

src/tests/bundles/jammy-bobcat.yaml

@@ -46,7 +46,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   manila-generic:
     charm: ../../../manila-generic.charm
@@ -67,7 +67,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
   nrpe:
     charm: ch:nrpe
     channel: latest/edge

src/tests/bundles/jammy-caracal.yaml

@@ -1,7 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 
-series: mantic
+local_overlay_enabled: False
+
+series: jammy
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -44,7 +46,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   manila-generic:
     charm: ../../../manila-generic.charm
@@ -65,7 +67,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
   nrpe:
     charm: ch:nrpe
     channel: latest/edge

src/tests/bundles/noble-caracal.yaml

@@ -1,7 +1,9 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: lunar
+local_overlay_enabled: False
+
+series: noble
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -44,7 +46,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   manila-generic:
     charm: ../../../manila-generic.charm
@@ -65,7 +67,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
   nrpe:
     charm: ch:nrpe
     channel: latest/edge

src/tests/tests.yaml

@@ -2,15 +2,12 @@ charm_name: manila-generic
 
 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
 target_deploy_status: {}
 
 tests:
@@ -23,7 +20,4 @@ tests_options:
   force_deploy:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
-    - jammy-antelope
-    - jammy-bobcat
-    - lunar-antelope
-    - mantic-bobcat
+    - 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}