From 7c26fa177e7a91edf1a31d5f0f0b63044461e4a1 Mon Sep 17 00:00:00 2001
From: Dariusz Smigiel <dsmigiel@redhat.com>
Date: Fri, 18 Nov 2022 11:47:01 -0800
Subject: [PATCH] Add TripleO Zed update and upgrade jobs

- created Zed upgrade zuul template between
Wallaby and Zed releases.
- created undercloud-upgrade job

Change-Id: I63fa6b0699450d9a4439d31db190d1d01cbc71d5
---
 .../templates/oooq_common_functions.sh.j2     |  3 ++
 zuul.d/periodic.yaml                          | 24 ++++++++++++--
 zuul.d/upgrades-jobs-templates.yaml           | 33 +++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/roles/run-test/templates/oooq_common_functions.sh.j2 b/roles/run-test/templates/oooq_common_functions.sh.j2
index 619eb1639..048f93bec 100644
--- a/roles/run-test/templates/oooq_common_functions.sh.j2
+++ b/roles/run-test/templates/oooq_common_functions.sh.j2
@@ -21,6 +21,9 @@ function previous_release_mixed_upgrade_case {
         ''|master|promotion-testing-hash-master)
             echo "zed"
             ;;
+        zed|promotion-testing-hash-zed)
+            echo "wallaby"
+            ;;
         wallaby|promotion-testing-hash-wallaby)
             echo "victoria"
             ;;
diff --git a/zuul.d/periodic.yaml b/zuul.d/periodic.yaml
index 87abdfc57..310ce088e 100644
--- a/zuul.d/periodic.yaml
+++ b/zuul.d/periodic.yaml
@@ -134,13 +134,31 @@
             dependencies:
               - tripleo-ci-centos-9-content-provider
 
+- project-template:
+    name: tripleo-periodic-upgrades-zed-pipeline
+    periodic:
+      jobs:
+        - tripleo-ci-centos-9-content-provider-zed: &force_non_periodic
+            vars:
+              force_non_periodic: true
+        - tripleo-ci-centos-9-content-provider-wallaby: *force_non_periodic
+        - tripleo-ci-centos-9-undercloud-upgrade-zed:
+            irrelevant-files: *undercloud_ignored
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider-zed
+              - tripleo-ci-centos-9-content-provider-wallaby
+        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates:
+            irrelevant-files: *multinode_ignored
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider-zed
+
 - project-template:
     name: tripleo-periodic-upgrades-wallaby-pipeline
     periodic:
       jobs:
-        - tripleo-ci-centos-9-content-provider-wallaby: &force_non_periodic
-            vars:
-              force_non_periodic: true
+        - tripleo-ci-centos-9-content-provider-wallaby: *force_non_periodic
         - tripleo-ci-centos-8-content-provider-wallaby: *force_non_periodic
         - tripleo-ci-centos-8-content-provider-train: *force_non_periodic
         - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates:
diff --git a/zuul.d/upgrades-jobs-templates.yaml b/zuul.d/upgrades-jobs-templates.yaml
index ce4739561..515e75654 100644
--- a/zuul.d/upgrades-jobs-templates.yaml
+++ b/zuul.d/upgrades-jobs-templates.yaml
@@ -116,6 +116,27 @@
         - tripleo-ci-centos-9-undercloud-upgrade: *cs9_undercloud_upgrade
         - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
 
+- project-template:
+    name: tripleo-upgrades-zed-pipeline
+    queue: tripleo
+    check:
+      jobs:
+        - tripleo-ci-centos-9-content-provider
+        - tripleo-ci-centos-9-content-provider-wallaby
+        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
+        - tripleo-ci-centos-9-undercloud-upgrade-zed: &cs9_undercloud_upgrade_zed
+            vars: *consumer_vars
+            irrelevant-files: *undercloud_ignored
+            dependencies:
+              - tripleo-ci-centos-9-content-provider
+              - tripleo-ci-centos-9-content-provider-wallaby
+    gate:
+      jobs:
+        - tripleo-ci-centos-9-content-provider
+        - tripleo-ci-centos-9-content-provider-wallaby
+        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
+        - tripleo-ci-centos-9-undercloud-upgrade-zed: *cs9_undercloud_upgrade_zed
+
 - project-template:
     name: tripleo-upgrades-wallaby-pipeline
     queue: tripleo
@@ -226,6 +247,18 @@
       extra_tags:
         - undercloud-upgrade
 
+- job:
+    name: tripleo-ci-centos-9-undercloud-upgrade-zed
+    parent: tripleo-ci-base-undercloud-centos-9
+    branches: ^stable/zed$
+    voting: true
+    vars:
+      featureset: '050'
+      featureset_override:
+        validate_services: false
+      extra_tags:
+        - undercloud-upgrade
+
 ## CentOS 8 undercloud upgrade
 - job:
     name: tripleo-ci-centos-8-undercloud-upgrade