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

charmcraft.yaml

@@ -6,9 +6,8 @@ parts:
     build-packages:
       - tox
       - git
-    source: src/
-    build-packages:
       - python3-dev
+    source: src/
     build-snaps:
       - charm
     build-environment:
@@ -23,9 +22,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, arm64, ppc64el, s390x]
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, arm64, ppc64el, s390x]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, arm64, ppc64el, s390x]

osci.yaml

@@ -1,6 +1,6 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-unit-jobs-py310
       - charm-functional-jobs
     vars:
       needs_charm_build: true

src/metadata.yaml

@@ -11,8 +11,6 @@ tags:
   - openstack
 series:
   - jammy
-  - lunar
-  - mantic
 subordinate: false
 requires:
   shared-db:

src/tests/bundles/jammy-antelope.yaml

@@ -42,7 +42,7 @@ applications:
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,7 +106,7 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2024.1/edge
 
   vault:
     charm: ch:vault
@@ -126,11 +126,11 @@ applications:
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: reef/edge
 
 relations:
 - - 'keystone:shared-db'

src/tests/bundles/jammy-bobcat.yaml

@@ -42,7 +42,7 @@ applications:
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,7 +106,7 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2024.1/edge
 
   vault:
     charm: ch:vault
@@ -126,11 +126,11 @@ applications:
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: reef/edge
 
 relations:
 - - 'keystone:shared-db'

src/tests/bundles/jammy-caracal.yaml

@@ -1,7 +1,7 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 
-series: &series mantic
+series: &series jammy
 
 applications:
 
@@ -42,7 +42,7 @@ applications:
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,7 +106,7 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2024.1/edge
 
   vault:
     charm: ch:vault
@@ -126,11 +126,11 @@ applications:
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: reef/edge
 
 relations:
 - - 'keystone:shared-db'

src/tests/bundles/noble-caracal.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: &series lunar
+series: &series noble
 
 applications:
 
@@ -42,7 +42,7 @@ applications:
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2024.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,7 +106,7 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2024.1/edge
 
   vault:
     charm: ch:vault
@@ -126,11 +126,11 @@ applications:
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: reef/edge
 
 relations:
 - - 'keystone:shared-db'

src/tests/tests.yaml

@@ -2,13 +2,9 @@ charm_name: watcher
 gate_bundles:
   - jammy-antelope
   - jammy-bobcat
-  - lunar-antelope
+  - jammy-caracal
-  - mantic-bobcat
-
 smoke_bundles:
-  - jammy-antelope
+  - jammy-caracal
-  - jammy-bobcat
-
 configure:
   - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
   - zaza.openstack.charm_tests.ceilometer.setup.basic_setup
@@ -22,8 +18,8 @@ tests:
   - zaza.openstack.charm_tests.watcher.tests.WatcherTests
 
 tests_options:
-  force_deploy: []
+  force_deploy:
-
+    - noble-caracal
 target_deploy_status:
   ovn-chassis:
     workload-status: waiting
@@ -40,3 +36,5 @@ target_deploy_status:
   ceilometer:
     workload-status: blocked
     workload-status-message-prefix: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi"
+dev_bundles:
+  - noble-caracal

src/tox.ini

@@ -19,7 +19,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

@@ -54,22 +54,30 @@ 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:py38]
 basepython = python3.8
-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:py311]
 basepython = python3.11
-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]
@@ -90,7 +98,9 @@ commands = functest-run-suite --keep-model --bundle {posargs}
 # 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}