From 06ea572de5047da14b653f103be02f4ceb6908c4 Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Mon, 4 Apr 2022 15:25:46 +0530
Subject: [PATCH] Added Clear reparenting for Undercloud Jobs

As a part of reparenting strategy[1], It adds the following jobs
* tripleo-ci-undercloud-required-projects-upstream

By using above as a parent, we created following
distro jobs.
* tripleo-ci-base-undercloud-centos-7
* tripleo-ci-base-undercloud-centos-8
* tripleo-ci-base-undercloud-centos-9

The above parent is now used in Undercloud and centos-7
content provider jobs.
It removes tripleo-ci-undercloud-content-consumer-centos-8
unused jobs.

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: Ic14a34c9c8dc196b42603a539bd67685d5384a0b
---
 zuul.d/base.yaml            |  8 ------
 zuul.d/undercloud-jobs.yaml | 49 ++++++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 220e98112..678874f49 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -252,14 +252,6 @@
         - undercloud-validate
         - images
 
-- job:
-    name: tripleo-ci-undercloud-content-consumer-centos-8
-    abstract: true
-    description: |
-        Intermediate layer for content consumer undercloud jobs
-    pre-run: playbooks/tripleo-ci/install-built-repo.yml
-    parent: tripleo-ci-base-singlenode-centos-8
-
 - job:
     name: tripleo-ci-base-standalone
     abstract: true
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index 36f28655c..100a4061b 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -91,9 +91,47 @@
               - tripleo-ci-centos-7-content-provider
         - tripleo-ci-centos-9-undercloud-containers: *c9_vars
 
+
+# Undercloud Jobs
+
+- job:
+    name: tripleo-ci-undercloud-required-projects-upstream
+    abstract: true
+    description: |
+      Base abstract job for undercloud in TripleO CI zuulv3 jobs
+    parent: tripleo-ci-base-singlenode-standard
+
+# Distribution Jobs
+# Centos 7 base job
+- job:
+    name: tripleo-ci-base-undercloud-centos-7
+    abstract: true
+    description: |
+            Base abstract job for standalone Tripleo CI CentOS 7 zuulv3 jobs.
+    parent: tripleo-ci-undercloud-required-projects-upstream
+    nodeset: single-centos-7-node
+
+# Centos 8 base jobs
+- job:
+    name: tripleo-ci-base-undercloud-centos-8
+    abstract: true
+    description: |
+            Base abstract job for standalone TripleO CI CentOS 8 zuulv3 jobs.
+    parent: tripleo-ci-undercloud-required-projects-upstream
+    nodeset: single-centos-8-node
+
+# CentOS - 9 base jobs
+- job:
+    name: tripleo-ci-base-undercloud-centos-9
+    abstract: true
+    description: |
+            Base abstract job for standalone TripleO CI CentOS 9 zuulv3 jobs.
+    parent: tripleo-ci-undercloud-required-projects-upstream
+    nodeset: single-centos-9-node
+
 - job:
     name: tripleo-ci-centos-8-undercloud-containers
-    parent: tripleo-ci-undercloud-content-consumer-centos-8
+    parent: tripleo-ci-base-undercloud-centos-8
     branches: ^(stable/(train|ussuri|victoria|wallaby)).*$
     voting: true
     vars:
@@ -105,9 +143,8 @@
 
 - job:
     name: tripleo-ci-centos-9-undercloud-containers
-    parent: tripleo-ci-undercloud-content-consumer-centos-8
+    parent: tripleo-ci-base-undercloud-centos-9
     branches: ^(?!stable/(train|ussuri|victoria)).*$
-    nodeset: single-centos-9-node
     irrelevant-files: *undercloud_ignored
     vars:
       featureset: '027'
@@ -118,8 +155,7 @@
 
 - job:
     name: tripleo-ci-centos-7-undercloud-oooq
-    parent: tripleo-ci-base-singlenode
-    nodeset: single-centos-7-node
+    parent: tripleo-ci-base-undercloud-centos-7
     branches: ^(stable/queens).*$
     vars:
       featureset: '003'
@@ -130,7 +166,8 @@
 
 - job:
     name: tripleo-ci-centos-7-content-provider-base
-    parent: tripleo-ci-base-singlenode
+    parent: tripleo-ci-base-singlenode-standard
+    nodeset: single-centos-7-node
     run:
       - playbooks/tripleo-buildcontainers/docker.yaml
       - playbooks/tripleo-ci/run-v3.yaml