From 337cf3c9bf663d17f4ed8b99e5f19b8bd9f2f228 Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Tue, 31 Jan 2023 16:16:54 +0100
Subject: [PATCH] CI: Add Rocky9 upgrade jobs

Rocky9 support landed in Zed release, we should start test them in
Antelope.

Change-Id: If4ca6aab660793015d577c3dfbeb7c75ca08c3fb
---
 zuul.d/jobs.yaml    | 51 +++++++++++++++++++++++++++++++++++++++++++++
 zuul.d/project.yaml |  7 +++++++
 2 files changed, 58 insertions(+)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ba5adfa13..527239620 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -111,6 +111,16 @@
     vars:
       base_distro: ubuntu
 
+- job:
+    name: kolla-ansible-rocky9-upgrade
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-rocky9
+    timeout: 9000
+    vars:
+      base_distro: rocky
+      is_upgrade: yes
+      tls_enabled: true
+
 - job:
     name: kolla-ansible-debian-upgrade
     parent: kolla-ansible-base
@@ -146,6 +156,15 @@
       is_upgrade: yes
       tls_enabled: true
 
+- job:
+    name: kolla-ansible-rocky9-upgrade-cephadm
+    parent: kolla-ansible-cephadm-base
+    nodeset: kolla-ansible-rocky9-multi
+    timeout: 9000
+    vars:
+      base_distro: rocky
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-ubuntu-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
@@ -155,6 +174,15 @@
       base_distro: ubuntu
       is_upgrade: yes
 
+- job:
+    name: kolla-ansible-rocky9-upgrade-ovn
+    parent: kolla-ansible-ovn-base
+    nodeset: kolla-ansible-rocky9-multi
+    timeout: 9000
+    vars:
+      base_distro: rocky
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-ubuntu-upgrade-ovn
     parent: kolla-ansible-ovn-base
@@ -219,6 +247,18 @@
       # of Kolla Ansible and need to know the version of images.
       base_distro_version: jammy
 
+- job:
+    name: kolla-ansible-rocky9-swift-upgrade
+    parent: kolla-ansible-swift-base
+    nodeset: kolla-ansible-rocky9-multi
+    timeout: 10800
+    vars:
+      base_distro: rocky
+      # NOTE(yoctozepto): We need this here because we initialise Swift outside
+      # of Kolla Ansible and need to know the version of images.
+      base_distro_version: 9
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-ubuntu-swift-upgrade
     parent: kolla-ansible-swift-base
@@ -226,6 +266,9 @@
     timeout: 10800
     vars:
       base_distro: ubuntu
+      # NOTE(yoctozepto): We need this here because we initialise Swift outside
+      # of Kolla Ansible and need to know the version of images.
+      base_distro_version: jammy
       is_upgrade: yes
 
 - job:
@@ -340,6 +383,14 @@
     vars:
       base_distro: ubuntu
 
+- job:
+    name: kolla-ansible-rocky9-prometheus-opensearch-upgrade
+    parent: kolla-ansible-prometheus-opensearch-base
+    nodeset: kolla-ansible-rocky9
+    vars:
+      base_distro: rocky
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade
     parent: kolla-ansible-prometheus-opensearch-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index cf5476d07..c38803a7e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -37,6 +37,7 @@
         - kolla-ansible-rocky9-ironic
         - kolla-ansible-debian-ironic
         - kolla-ansible-ubuntu-ironic
+        - kolla-ansible-rocky9-upgrade
         - kolla-ansible-debian-upgrade
         - kolla-ansible-ubuntu-upgrade
         - kolla-ansible-ubuntu-binary-upgrade
@@ -46,13 +47,17 @@
         - kolla-ansible-ubuntu-mariadb
         - kolla-ansible-rocky9-ovn
         - kolla-ansible-ubuntu-ovn
+        - kolla-ansible-rocky9-upgrade-ovn
         - kolla-ansible-ubuntu-upgrade-ovn
         - kolla-ansible-rocky9-prometheus-opensearch
         - kolla-ansible-ubuntu-prometheus-opensearch
+        - kolla-ansible-rocky9-prometheus-opensearch-upgrade
         - kolla-ansible-ubuntu-prometheus-opensearch-upgrade
+        - kolla-ansible-rocky9-venus
         - kolla-ansible-ubuntu-venus
         - kolla-ansible-rocky9-cephadm
         - kolla-ansible-ubuntu-cephadm
+        - kolla-ansible-rocky9-upgrade-cephadm
         - kolla-ansible-ubuntu-upgrade-cephadm
         - kolla-ansible-rocky9-hashi-vault
     check-arm64:
@@ -64,8 +69,10 @@
         - kolla-ansible-debian
         - kolla-ansible-debian-upgrade
         - kolla-ansible-rocky9
+        - kolla-ansible-rocky9-upgrade
         - kolla-ansible-ubuntu
         - kolla-ansible-ubuntu-upgrade
     experimental:
       jobs:
+        - kolla-ansible-rocky9-swift-upgrade
         - kolla-ansible-ubuntu-swift-upgrade
-- 
GitLab