Merge pull request #306 from freyes/caracal

Add OpenStack 2024.1 (Caracal) jobs
openstack-charmers · Feb 9, 2024 · 52f6984 · 52f6984
2 parents da4bac8 + 0b02ae5
commit 52f6984
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -185,6 +185,22 @@
       tox_envlist: py311
       python_version: '3.11'
 
+- job:
+    name: tox-py312
+    parent: tox
+    description: |
+      Run unit tests for a Python project under cPython version 3.12.
+
+      Uses tox with the ``py312`` environment.
+
+    nodeset:
+      nodes:
+        - name: noble-medium
+          label: noble-medium
+    vars:
+      tox_envlist: py312
+      python_version: '3.12'
+
 - job:
     name: charm-build
     description: Build a source charm into a deployable charm
@@ -477,6 +493,18 @@
       - charm-build
     vars:
       tox_extra_args: '-- bionic-queens'
+- job:
+    name: noble-caracal
+    description: Run a functional test against noble-caracal
+    parent: func-target-pre-jobs
+    dependencies:
+      - name: tox-py312
+        soft: true
+      - osci-lint
+      - charm-build
+    vars:
+      tox_extra_args: '-- noble-caracal'
+      juju_snap_channel: '3.3/stable'
 - job:
     name: mantic-bobcat
     description: Run a functional test against mantic-bobcat
@@ -551,6 +579,18 @@
       - charm-build
     vars:
       tox_extra_args: '-- groovy-victoria'
+- job:
+    name: jammy-caracal
+    description: Run a functional test against jammy-caracal
+    parent: func-target-pre-jobs
+    dependencies:
+      - name: tox-py310
+        soft: true
+      - osci-lint
+      - charm-build
+    vars:
+      tox_extra_args: '-- jammy-caracal'
+      juju_snap_channel: '3.3/stable'
 - job:
     name: jammy-bobcat
     description: Run a functional test against jammy-bobcat

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -76,6 +76,10 @@
     name: openstack-tox-py311
     description: |
       placeholder
+- project-template:
+    name: openstack-tox-py312
+    description: |
+      placeholder
 - project-template:
     name: openstack-cover-jobs
     description: |
@@ -94,6 +98,22 @@
       The default set of functional test jobs for the OpenStack Charms
     check:
       jobs:
+        - noble-caracal:
+            voting: false
+            branches:
+              - main
+              - master
+              - stable/2024.1  # OpenStack
+              - stable/24.03   # OVN
+              - stable/noble   # Ubuntu
+        - jammy-caracal:
+            voting: false
+            branches:
+              - main
+              - master
+              - stable/2024.1  # OpenStack
+              - stable/24.03   # OVN
+              - stable/noble   # Ubuntu
         - mantic-bobcat:
             voting: false
             branches:
@@ -123,8 +143,6 @@
               - stable/jammy
         - jammy-antelope:
             branches:
-              - main
-              - master
               - stable/2023.1
               - stable/2023.2
               - stable/1.8
@@ -377,6 +395,21 @@
         # NOTE(icey) BUT REALLY, DO NOT ENABLE THE FOLLOWING UNTIL YOU KNOW WE CAN
         # RUN A 3.11 JOB ON ZOSCI.
         #- tox-py311
+- project-template:
+    name: charm-unit-jobs-py312
+    description: |
+      The default set of unit tests and lint checks for the OpenStack Charms
+    check:
+      jobs:
+        - charm-build
+        - osci-lint
+        # NOTE: disabled until we can get zuul, ansible and py312 on caracal to
+        # play together.
+        #
+        # NOTE: BUT REALLY, DO NOT ENABLE THE FOLLOWING UNTIL YOU KNOW WE CAN
+        # RUN A 3.12 JOB ON ZOSCI.
+        #
+        #- tox-py312
 - project-template:
     name: charm-yoga-unit-jobs
     description: |