CI: Rename tempest jobs to include CNI

Change-Id: Id367edb08dc31447cf9268e047b0b41fb22b89db
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

zuul.d/base.yaml

@@ -60,3 +60,7 @@
         o-da: true
         o-hk: true
         o-hm: true
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico
+    parent: magnum-capi-helm-tests-cluster

zuul.d/jobs-v1-34.yaml

@@ -1,44 +0,0 @@
----
-- project-template:
-    name: magnum-capi-helm-tests-cluster-v1_34
-    description: |
-      Runs Magnum CAPI Helm v1.34 jobs
-    check:
-      jobs:
-        - magnum-capi-helm-tests-cluster-v1_34
-        - magnum-capi-helm-tests-cluster-v1_34-2026_1
-        - magnum-capi-helm-tests-cluster-v1_34-2025_2
-        - magnum-capi-helm-tests-cluster-v1_34-2025_1
-    gate:
-      jobs:
-        - magnum-capi-helm-tests-cluster-v1_34
-        - magnum-capi-helm-tests-cluster-v1_34-2026_1
-        - magnum-capi-helm-tests-cluster-v1_34-2025_2
-        - magnum-capi-helm-tests-cluster-v1_34-2025_1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_34-2026_1
-    parent: magnum-capi-helm-tests-cluster-v1_34
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2026.1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_34-2025_2
-    parent: magnum-capi-helm-tests-cluster-v1_34
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2025.2
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_34-2025_1
-    parent: magnum-capi-helm-tests-cluster-v1_34
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2025.1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_34
-    parent: magnum-capi-helm-tests-cluster
-    vars:
-      kube_version: "v1.34.7"

zuul.d/jobs-v1-35.yaml

@@ -1,45 +0,0 @@
----
-- project-template:
-    name: magnum-capi-helm-tests-cluster-v1_35
-    description: |
-      Runs Magnum CAPI Helm v1.35 jobs
-    check:
-      jobs:
-        - magnum-capi-helm-tests-cluster-v1_35
-        - magnum-capi-helm-tests-cluster-v1_35-2026_1
-        - magnum-capi-helm-tests-cluster-v1_35-2025_2
-        - magnum-capi-helm-tests-cluster-v1_35-2025_1
-    gate:
-      jobs:
-        - magnum-capi-helm-tests-cluster-v1_35
-        - magnum-capi-helm-tests-cluster-v1_35-2026_1
-        - magnum-capi-helm-tests-cluster-v1_35-2025_2
-        - magnum-capi-helm-tests-cluster-v1_35-2025_1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_35-2026_1
-    parent: magnum-capi-helm-tests-cluster-v1_35
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2026.1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_35-2025_2
-    parent: magnum-capi-helm-tests-cluster-v1_35
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2025.2
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_35-2025_1
-    parent: magnum-capi-helm-tests-cluster-v1_35
-    required-projects:
-      - name: openstack/magnum
-        override-checkout: stable/2025.1
-
-- job:
-    name: magnum-capi-helm-tests-cluster-v1_35
-    parent: magnum-capi-helm-tests-cluster
-    vars:
-      kube_version: "v1.35.5"
-      kube_version_dir: "2026.05-5"

zuul.d/project-templates-tempest.yaml

@@ -0,0 +1,63 @@
+---
+- project-template:
+    name: magnum-capi-helm-tests-cluster-v1_34
+    description: |
+      Runs Magnum CAPI Helm with Magnum master
+    check:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34
+    gate:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34
+
+- project-template:
+    name: magnum-capi-helm-tests-cluster
+    description: |
+      Runs Magnum CAPI Helm with Magnum master
+    check:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34
+        - magnum-capi-helm-tests-cluster-calico-v1-35
+    gate:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34
+        - magnum-capi-helm-tests-cluster-calico-v1-35
+
+- project-template:
+    name: magnum-capi-helm-tests-cluster-2026-1
+    description: |
+      Runs Magnum CAPI Helm with Magnum master
+    check:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2026-1
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2026-1
+    gate:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2026-1
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2026-1
+
+- project-template:
+    name: magnum-capi-helm-tests-cluster-2025-2
+    description: |
+      Runs Magnum CAPI Helm with Magnum master
+    check:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2025-2
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2025-2
+    gate:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2025-2
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2025-2
+
+- project-template:
+    name: magnum-capi-helm-tests-cluster-2025-1
+    description: |
+      Runs Magnum CAPI Helm with Magnum master
+    check:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2025-1
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2025-1
+    gate:
+      jobs:
+        - magnum-capi-helm-tests-cluster-calico-v1-34-2025-1
+        - magnum-capi-helm-tests-cluster-calico-v1-35-2025-1

zuul.d/project.yaml

@@ -2,8 +2,10 @@
 - project:
     queue: magnum
     templates:
-      - magnum-capi-helm-tests-cluster-v1_34
-      - magnum-capi-helm-tests-cluster-v1_35
+      - magnum-capi-helm-tests-cluster
+      - magnum-capi-helm-tests-cluster-2026-1
+      - magnum-capi-helm-tests-cluster-2025-2
+      - magnum-capi-helm-tests-cluster-2025-1
       - openstack-cover-jobs-magnum
       - openstack-python3-jobs-magnum
       - release-notes-jobs-python3

zuul.d/tempest-jobs-v1-34.yaml

@@ -0,0 +1,35 @@
+---
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-34
+    parent: magnum-capi-helm-tests-cluster-calico
+    vars:
+      kube_version: "v1.34.8"
+      kube_version_dir: "2026.05-6"
+
+- job:
+    name: magnum-capi-helm-tests-cluster-v1_34
+    parent: magnum-capi-helm-tests-cluster-calico
+    vars:
+      kube_version: "v1.34.8"
+      kube_version_dir: "2026.05-6"
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-34-2025-1
+    parent: magnum-capi-helm-tests-cluster-calico-v1-34
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2025.1
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-34-2025-2
+    parent: magnum-capi-helm-tests-cluster-calico-v1-34
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2025.2
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-34-2026-1
+    parent: magnum-capi-helm-tests-cluster-calico-v1-34
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2026.1

zuul.d/tempest-jobs-v1-35.yaml

@@ -0,0 +1,28 @@
+---
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-35
+    parent: magnum-capi-helm-tests-cluster-calico
+    vars:
+      kube_version: "v1.35.5"
+      kube_version_dir: "2026.05-6"
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-35-2025-1
+    parent: magnum-capi-helm-tests-cluster-calico-v1-35
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2025.1
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-35-2025-2
+    parent: magnum-capi-helm-tests-cluster-calico-v1-35
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2025.2
+
+- job:
+    name: magnum-capi-helm-tests-cluster-calico-v1-35-2026-1
+    parent: magnum-capi-helm-tests-cluster-calico-v1-35
+    required-projects:
+      - name: openstack/magnum
+        override-checkout: stable/2026.1