From 8fab0d46b3d55e387fe102c27ad2f52b71c140b9 Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <raukadah@gmail.com>
Date: Thu, 16 Jan 2025 13:51:16 +0530
Subject: [PATCH] Test opendev watcher master content in CI job

In order to test opendev watcher master content in CI job, this pr
adds following thigs:
* opendev-master-watcher-operator-pipeline project template which
  will run meta content provider from master and then Deploy EDPM
  job watcher-operator-validation-master from mastter content.

* It changes the existing job watcher-operator-validation (still
  deploying the antelope content) with update_containers: false to avoid
  using meta content provider containers.

* It also updates the existing watcher-operator-validation and watcher-operator-kuttl
  job to use openstack-meta-content-provider-master as a job
  dependencies.

Depends-On: https://review.opendev.org/c/openstack/watcher/+/938893

Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
---
 .zuul.yaml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1c59d6d..ed08701 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,20 +2,20 @@
 - project:
     name: openstack-k8s-operators/watcher-operator
     default-branch: main
+    templates:
+      - opendev-master-watcher-operator-pipeline
     github-check:
       jobs:
         - noop
         - watcher-operator-doc-preview
-        - openstack-meta-content-provider:
-            vars:
-              cifmw_operator_build_meta_build: false
         - watcher-operator-validation
         - watcher-operator-kuttl
 
 - job:
     name: watcher-operator-base
+    override-checkout: main
     parent: podified-multinode-edpm-deployment-crc-2comp
-    dependencies: ["openstack-meta-content-provider"]
+    dependencies: ["openstack-meta-content-provider-master"]
     description: |
       A multinode EDPM Zuul job which has one ansible controller, one
       extracted crc and two computes. It will be used for testing watcher-operator.
@@ -40,9 +40,19 @@
       A zuul job to validate the watcher operator and its service deployment.
     vars:
       run_tempest: false
+      # Donot use openstack services from meta content provider master
+      # job.
+      cifmw_update_containers: false
+    extra-vars:
+      # Override zuul meta content provider provided content_provider_dlrn_md5_hash
+      # var. As returned dlrn md5 hash comes from master release but job is using
+      # antelope content.
+      content_provider_dlrn_md5_hash: ''
 
 - job:
     name: watcher-operator-kuttl
+    override-checkout: main
+    dependencies: ["openstack-meta-content-provider-master"]
     parent: cifmw-multinode-kuttl-operator-target
     description: |
       A zuul job to run watcher operator kuttl tests.
@@ -71,3 +81,50 @@
     vars:
       asciidoc_available: true
       doc_available: false
+
+##########################################################
+#                                                        #
+#               Master Zuul Jobs                         #
+#                                                        #
+##########################################################
+
+
+- job:
+    name: openstack-meta-content-provider-master
+    override-checkout: main
+    description: |
+      A zuul job building content from OpenDev master release.
+    parent: openstack-meta-content-provider
+    vars:
+      cifmw_operator_build_meta_build: false
+      cifmw_bop_openstack_release: master
+      cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
+      cifmw_repo_setup_branch: master
+
+- job:
+    name: watcher-operator-validation-master
+    parent: watcher-operator-validation
+    override-checkout: main
+    description: |
+      A Zuul job consuming content from openstack-meta-content-provider-master
+      and deploying EDPM with master content.
+    dependencies: ["openstack-meta-content-provider-master"]
+    vars:
+      cifmw_repo_setup_branch: master
+
+##########################################################
+#                                                        #
+#               Project Template                         #
+#                                                        #
+##########################################################
+
+- project-template:
+    name: opendev-master-watcher-operator-pipeline
+    description: |
+      Project template to run meta content provider and
+      EDPM job with master opendev and github operator
+      content.
+    github-check:
+      jobs:
+        - openstack-meta-content-provider-master
+        - watcher-operator-validation-master