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

charmcraft.yaml

@@ -52,67 +52,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: magnum-dashboard
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable

src/metadata.yaml

@@ -4,11 +4,9 @@ maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
   This is the dashboard for the OpenStack COE service, Magnum.
 tags:
-- openstack
+  - openstack
 series:
-- jammy
-- lunar
-- mantic
+  - jammy
 subordinate: true
 requires:
   dashboard:

src/tests/bundles/jammy-antelope.yaml

@@ -45,7 +45,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '2'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum:
     charm: ch:magnum
@@ -55,7 +55,7 @@ applications:
       cert-manager-type: x509keypair
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -64,7 +64,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum-dashboard:
     charm: ../../../magnum-dashboard.charm

src/tests/bundles/jammy-bobcat.yaml

@@ -45,7 +45,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '2'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum:
     charm: ch:magnum
@@ -55,7 +55,7 @@ applications:
       cert-manager-type: x509keypair
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -64,7 +64,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum-dashboard:
     charm: ../../../magnum-dashboard.charm

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'
@@ -45,7 +45,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '2'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum:
     charm: ch:magnum
@@ -55,7 +55,7 @@ applications:
       cert-manager-type: x509keypair
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -64,7 +64,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum-dashboard:
     charm: ../../../magnum-dashboard.charm

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'
@@ -45,7 +45,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '2'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum:
     charm: ch:magnum
@@ -55,7 +55,7 @@ applications:
       cert-manager-type: x509keypair
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -64,7 +64,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   magnum-dashboard:
     charm: ../../../magnum-dashboard.charm

src/tests/tests.yaml

@@ -1,24 +1,20 @@
 charm_name: magnum-dashboard
 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: {}
 
 configure:
-- zaza.charm_tests.noop.setup.basic_setup
+  - zaza.charm_tests.noop.setup.basic_setup
 
 tests:
-- zaza.charm_tests.noop.tests.NoopTest
+  - zaza.charm_tests.noop.tests.NoopTest
 
 tests_options:
   force_deploy:
-    - 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}