Merge "CI: Add SLURP upgrade jobs"

zuul.d/jobs.yaml

@@ -92,7 +92,6 @@
       - ^zuul.d/.*
     vars:
       # Name of the release to upgrade from for upgrade jobs.
-      previous_release: 2023.2
       logs_dir: "/tmp/logs"
       ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}"
       kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}"
@@ -104,6 +103,8 @@
       requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
       tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
       is_upgrade: "{{ 'upgrade' in zuul.job }}"
+      is_slurp: "{{ 'slurp' in zuul.job }}"
+      previous_release: "{{ '2023.1' if is_slurp else '2023.2' }}"
       tls_enabled: false
       ironic_boot_mode: "bios"
 
@@ -174,6 +175,16 @@
     parent: kayobe-overcloud-upgrade-base
     nodeset: kayobe-ubuntu-jammy
 
+- job:
+    name: kayobe-overcloud-upgrade-slurp-rocky9
+    parent: kayobe-overcloud-upgrade-base
+    nodeset: kayobe-rocky9
+
+- job:
+    name: kayobe-overcloud-upgrade-slurp-ubuntu-jammy
+    parent: kayobe-overcloud-upgrade-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-seed-base
     parent: kayobe-base
@@ -279,6 +290,16 @@
     parent: kayobe-seed-upgrade-base
     nodeset: kayobe-ubuntu-jammy
 
+- job:
+    name: kayobe-seed-upgrade-slurp-rocky9
+    parent: kayobe-seed-upgrade-base
+    nodeset: kayobe-rocky9
+
+- job:
+    name: kayobe-seed-upgrade-slurp-ubuntu-jammy
+    parent: kayobe-seed-upgrade-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-seed-vm-base
     parent: kayobe-base

zuul.d/project.yaml

@@ -20,11 +20,15 @@
         - kayobe-overcloud-host-configure-ubuntu-jammy
         - kayobe-overcloud-upgrade-rocky9
         - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-slurp-rocky9
+        - kayobe-overcloud-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-images-rocky9
         - kayobe-seed-upgrade-rocky9
         - kayobe-seed-upgrade-ubuntu-jammy
+        - kayobe-seed-upgrade-slurp-rocky9
+        - kayobe-seed-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-jammy
         - kayobe-infra-vm-rocky9
@@ -43,10 +47,14 @@
         - kayobe-overcloud-host-configure-ubuntu-jammy
         - kayobe-overcloud-upgrade-rocky9
         - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-slurp-rocky9
+        - kayobe-overcloud-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-upgrade-rocky9
         - kayobe-seed-upgrade-ubuntu-jammy
+        - kayobe-seed-upgrade-slurp-rocky9
+        - kayobe-seed-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-jammy
         - kayobe-infra-vm-rocky9