Replace tcib base with meta content provider

openstack-k8s-operators/ci-framework#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. Depends-On: https://review.opendev.org/c/openstack/nova/+/921687 Depends-On: openstack-k8s-operators/nova-operator#777 Depends-On: openstack-k8s-operators/ci-framework#1892 Depends-On: openstack-k8s-operators/edpm-image-builder#28 Signed-off-by: Chandan Kumar <[email protected]>
openstack-k8s-operators · Jun 24, 2024 · 2b3bea5 · 2b3bea5
1 parent 5ef2cef
commit 2b3bea5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/zuul.d/job.yaml b/zuul.d/job.yaml
@@ -1,11 +1,7 @@
 ---
 - 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
     irrelevant-files: &if
       - HACKING.rst
       - AUTHORS
@@ -20,24 +16,17 @@
       - .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"
 

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
@@ -3,8 +3,22 @@
     name: openstack-k8s-operators/tcib
     github-check:
       jobs:
-        - tcib-build-containers
+        - 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: &content_provider
             dependencies:
-              - tcib-build-containers
+              - openstack-meta-content-provider
         - tcib-podified-multinode-edpm-deployment-crc: *content_provider