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

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

@@ -9,11 +9,9 @@ description: |
   OpenStack Train or later is required.
 docs: https://discourse.charmhub.io/t/placement-docs-index/10547
 tags:
-- openstack
+  - openstack
 series:
-- jammy
+  - jammy
-- lunar
-- mantic
 subordinate: false
 requires:
   shared-db:

src/tests/bundles/jammy-antelope.yaml

@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   keystone:
     charm: ch:keystone
@@ -83,7 +83,7 @@ applications:
       admin-password: openstack
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -96,11 +96,11 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -110,7 +110,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -121,7 +121,7 @@ applications:
       debug: true
     to:
       - '8'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -135,7 +135,7 @@ applications:
       debug: true
     to:
       - '9'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ../../../placement.charm

src/tests/bundles/jammy-bobcat.yaml

@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   keystone:
     charm: ch:keystone
@@ -83,7 +83,7 @@ applications:
       admin-password: openstack
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -96,11 +96,11 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -110,7 +110,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -121,7 +121,7 @@ applications:
       debug: true
     to:
       - '8'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -135,7 +135,7 @@ applications:
       debug: true
     to:
       - '9'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ../../../placement.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'
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   keystone:
     charm: ch:keystone
@@ -83,7 +83,7 @@ applications:
       admin-password: openstack
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -96,11 +96,11 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -110,7 +110,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -121,7 +121,7 @@ applications:
       debug: true
     to:
       - '8'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -135,7 +135,7 @@ applications:
       debug: true
     to:
       - '9'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ../../../placement.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'
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   keystone:
     charm: ch:keystone
@@ -83,7 +83,7 @@ applications:
       admin-password: openstack
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -96,11 +96,11 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -110,7 +110,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -121,7 +121,7 @@ applications:
       debug: true
     to:
       - '8'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -135,7 +135,7 @@ applications:
       debug: true
     to:
       - '9'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ../../../placement.charm

src/tests/tests.yaml

@@ -18,16 +18,12 @@ configure:
 
 gate_bundles:
   - jammy-antelope
-
-smoke_bundles:
-  - jammy-antelope
-
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
+  - jammy-caracal
-  - mantic-bobcat
+smoke_bundles:
-
+  - jammy-caracal
+dev_bundles:
+  - noble-caracal
 tests_options:
   force_deploy:
-    - lunar-antelope
+    - noble-caracal
-    - mantic-bobcat

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}