From 7f283ff64713301d79d5d4c7b9fe9b75449f95e8 Mon Sep 17 00:00:00 2001
From: Chandan Kumar <raukadah@gmail.com>
Date: Tue, 18 Jun 2024 12:45:42 +0530
Subject: [PATCH] Replace tcib base with meta content provider

https://github.com/openstack-k8s-operators/ci-framework/pull/1892 adds
Meta content provider job to test opendev and github changes together.

This pr replaces tcib content provider with meta content provider
allowing users to test the content from different sources.

Signed-off-by: Chandan Kumar <raukadah@gmail.com>
---
 zuul.d/job.yaml      | 25 ++++++++-----------------
 zuul.d/projects.yaml | 22 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/zuul.d/job.yaml b/zuul.d/job.yaml
index c6d96abb..c069d716 100644
--- a/zuul.d/job.yaml
+++ b/zuul.d/job.yaml
@@ -1,11 +1,8 @@
 ---
 - job:
-    name: tcib-build-containers
-    parent: cifmw-tcib-base
-    nodeset: centos-stream-9-vexxhost
-    vars:
-      cifmw_build_containers_registry_namespace: podified-antelope-centos9
-      cifmw_build_containers_image_tag: "{{ cifmw_repo_setup_full_hash }}"
+    name: tcib-podified-multinode-edpm-deployment-crc
+    parent: podified-multinode-edpm-deployment-crc
+    dependencies: ["openstack-meta-content-provider"]
     irrelevant-files: &if
       - HACKING.rst
       - AUTHORS
@@ -20,29 +17,23 @@
       - .coveragerc
       - LICENSE
       - OWNERS*
-
-- job:
-    name: tcib-podified-multinode-edpm-deployment-crc
-    parent: podified-multinode-edpm-deployment-crc
-    irrelevant-files: *if
     vars: &edpm_vars
-      cifmw_update_containers_registry: "{{ content_provider_registry_ip }}:5001"
-      cifmw_update_containers_org: "podified-antelope-centos9"
-      cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash }}"
-      cifmw_update_containers_openstack: true
       cifmw_run_test_role: test_operator
       cifmw_run_tempest: true
-      cifmw_test_operator_tempest_registry: "{{ content_provider_registry_ip }}:5001"
+      cifmw_test_operator_tempest_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
+      cifmw_test_operator_tempest_namespace: "{{ content_provider_os_registry_url | split('/') | last }}"
       cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash }}"
       cifmw_test_operator_tempest_include_list: |
         tempest.scenario.test_network_basic_ops.TestNetworkBasicOps
       cifmw_run_tobiko: true
-      cifmw_test_operator_tobiko_registry: "{{ content_provider_registry_ip }}:5001"
+      cifmw_test_operator_tobiko_registry: "{{ cifmw_test_operator_tempest_registry }}"
+      cifmw_test_operator_tobiko_namespace: "{{ cifmw_test_operator_tempest_namespace }}"
       cifmw_test_operator_tobiko_image_tag: "{{ content_provider_dlrn_md5_hash }}"
       cifmw_test_operator_tobiko_testenv: "sanity"
 
 - job:
     name: tcib-crc-podified-edpm-baremetal
     parent: cifmw-crc-podified-edpm-baremetal
+    dependencies: ["openstack-meta-content-provider"]
     irrelevant-files: *if
     vars: *edpm_vars
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0ff019be..2ae3eb65 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -3,8 +3,20 @@
     name: openstack-k8s-operators/tcib
     github-check:
       jobs:
-        - tcib-build-containers
-        - tcib-crc-podified-edpm-baremetal: &content_provider
-            dependencies:
-              - tcib-build-containers
-        - tcib-podified-multinode-edpm-deployment-crc: *content_provider
+        - openstack-meta-content-provider:
+            irrelevant-files: &if
+              - HACKING.rst
+              - AUTHORS
+              - .gitignore
+              - ^README.md$
+              - .*/*.md
+              - .ci-operator.yaml
+              - .pre-commit-config.yaml
+              - .pylintrc
+              - .stestr.conf
+              - .github/workflows
+              - .coveragerc
+              - LICENSE
+              - OWNERS*
+        - tcib-crc-podified-edpm-baremetal
+        - tcib-podified-multinode-edpm-deployment-crc