Cleanup Caracal CI defs

Aligns the CI defs with what we want to run on master i.e.

 - jammy-bobcat-ha
 - jammy-bobcat-ha-ovn
 - jammy-caracal-ha
 - jammy-caracal-ha-ovn
 - noble-caracal-ha
 - noble-caracal-ha-ovn

Change-Id: Iaa6660939d1956acc6f41084ae27746310baf81d
Signed-off-by: Edward Hope-Morley <edward.hope-morley@canonical.com>

osci.yaml

@@ -3,15 +3,13 @@
       - charm-unit-jobs-py310
     check:
       jobs:
-      - jammy-antelope-ha
+      - jammy-bobcat-ha
-      - jammy-antelope-ha-ovn
+      - jammy-bobcat-ha-ovn
-      - jammy-bobcat-ha:
+      - jammy-caracal-ha
+      - jammy-caracal-ha-ovn
+      - noble-caracal-ha:
           voting: false
-      - jammy-bobcat-ha-ovn:
+      - noble-caracal-ha-ovn:
-          voting: false
-      - mantic-bobcat-ha:
-          voting: false
-      - mantic-bobcat-ha-ovn:
           voting: false
     vars:
       needs_charm_build: true
@@ -19,51 +17,43 @@
       build_type: charmcraft
       charmcraft_channel: 3.x/candidate
 
-- job:
-    name: jammy-antelope-ha
-    parent: func-target
-    dependencies:
-      - osci-lint
-      - name: tox-py310
-        soft: true
-      - charm-build
-    vars:
-      tox_extra_args: '-- jammy-antelope-ha'
-- job:
-    name: jammy-antelope-ha-ovn
-    parent: func-target
-    timeout: 18000
-    dependencies:
-      - jammy-antelope-ha
-    vars:
-      tox_extra_args: '-- jammy-antelope-ha-ovn'
 - job:
     name: jammy-bobcat-ha
     parent: func-target
-    dependencies:
-      - jammy-antelope-ha
     vars:
       tox_extra_args: '-- jammy-bobcat-ha'
 - job:
     name: jammy-bobcat-ha-ovn
     parent: func-target
     timeout: 18000
-    dependencies:
-      - jammy-antelope-ha
     vars:
       tox_extra_args: '-- jammy-bobcat-ha-ovn'
 - job:
-    name: mantic-bobcat-ha
+    name: jammy-caracal-ha
     parent: func-target
     dependencies:
       - jammy-antelope-ha
     vars:
-      tox_extra_args: '-- mantic-bobcat-ha'
+      tox_extra_args: '-- jammy-caracal-ha'
 - job:
-    name: mantic-bobcat-ha-ovn
+    name: jammy-caracal-ha-ovn
     parent: func-target
     timeout: 18000
     dependencies:
       - jammy-antelope-ha
     vars:
-      tox_extra_args: '-- mantic-bobcat-ha-ovn'
+      tox_extra_args: '-- jammy-caracal-ha-ovn'
+- job:
+    name: noble-caracal-ha
+    parent: func-target
+    dependencies:
+      - jammy-antelope-ha
+    vars:
+      tox_extra_args: '-- noble-caracal-ha'
+- job:
+    name: noble-caracal-ha-ovn
+    parent: func-target
+    dependencies:
+      - jammy-antelope-ha
+    vars:
+      tox_extra_args: '-- noble-caracal-ha-ovn'

src/tests/tests.yaml

@@ -10,10 +10,6 @@ dev_bundles:
 - noble-caracal-ha-ovn
 - noble-caracal-ha
 
-comment: |
-  The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
-    https://github.com/lxc/lxd/issues/4947
-
 target_deploy_status:
   octavia:
     workload-status: blocked