From 0b74cfb67cbbb731a6b96d1d7de9496a8a09924e Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Mon, 28 Feb 2022 12:30:16 +0200
Subject: [PATCH] Add centos-9 jobs for wallaby zuul layout

Adds neutron-centos-9-tripleo-standalone and
neutron-ovn-tripleo-ci-centos-9-containers-multinode definitions
for the stable/wallaby branch. Adds these to the existing
layout alongside the centos-8 versions. See the topic branch [1]
for related reviews and [2] for related context.

[1] https://review.opendev.org/q/topic:c9_wallaby_gates
[2] http://lists.openstack.org/pipermail/openstack-discuss/2022-February/027403.html
Change-Id: I79ebedcbc1abd3cfa054be9a30d6692b733c0a7e
---
 zuul.d/job-templates.yaml |  7 +++++++
 zuul.d/tripleo.yaml       | 21 +++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index cbd65775c8d..7662e2bb53c 100644
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@@ -66,3 +66,10 @@
         - neutron-ovn-tripleo-ci-centos-8-containers-multinode:
             vars: *consumer_vars
             dependencies: *consumer_deps
+        - tripleo-ci-centos-9-content-provider
+        - neutron-centos-9-tripleo-standalone: &c9_consumer
+            voting: true
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider
+        - neutron-ovn-tripleo-ci-centos-9-containers-multinode: *c9_consumer
diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml
index 345f87661a6..d2a5fd9e29f 100644
--- a/zuul.d/tripleo.yaml
+++ b/zuul.d/tripleo.yaml
@@ -2,7 +2,7 @@
     name: neutron-centos-8-tripleo-standalone
     parent: tripleo-ci-base-standalone-centos-8
     voting: false
-    vars:
+    vars: &tripleo_standalone_vars
       featureset: '052'
       featureset_override:
         standalone_environment_files:
@@ -16,7 +16,7 @@
         tempest_test_whitelist:
           - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
         use_os_tempest: true
-    irrelevant-files:
+    irrelevant-files: &tripleo_standalone_irrelevant
       - ^(test-|)requirements.txt$
       - ^releasenotes/.*$
       - ^doc/.*$
@@ -35,13 +35,20 @@
       - ^vagrant/.*$
       - ^zuul.d/(?!(project)).*\.yaml
 
+- job:
+    name: neutron-centos-9-tripleo-standalone
+    parent: tripleo-ci-centos-9-standalone
+    voting: false
+    vars: *tripleo_standalone_vars
+    irrelevant-files: *tripleo_standalone_irrelevant
+
 - job:
     name: neutron-ovn-tripleo-ci-centos-8-containers-multinode
     parent: tripleo-ci-centos-8-containers-multinode
-    vars:
+    vars: &tripleo_multinode_vars
       nodes: 1ctlr
       featureset: '010'
-    irrelevant-files:
+    irrelevant-files: &tripleo_multinode_irrelevant
       - ^(test-|)requirements.txt$
       - ^releasenotes/.*$
       - ^doc/.*$
@@ -69,3 +76,9 @@
       - ^neutron/scheduler/.*$
       - ^vagrant/.*$
       - ^zuul.d/(?!(project)).*\.yaml
+
+- job:
+    name: neutron-ovn-tripleo-ci-centos-9-containers-multinode
+    parent: tripleo-ci-centos-9-containers-multinode
+    vars: *tripleo_multinode_vars
+    irrelevant-files: *tripleo_multinode_irrelevant
\ No newline at end of file