Merge pull request #347 from steveb/main-master

Consume master packages from main branch

Author: openshift-merge-bot[bot]

zuul.d/job.yaml

@@ -1,9 +1,22 @@
 ---
 - job:
-    name: tcib-podified-multinode-edpm-deployment-crc
+    name: tcib-openstack-meta-content-provider-master
+    parent: openstack-meta-content-provider
+    vars:
+      cifmw_repo_setup_branch: master
+      cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
+      cifmw_bop_openstack_release: master
+      cifmw_set_openstack_containers_namespace: podified-master-centos9
+      cifmw_update_containers_org: "podified-master-centos9"
+      cifmw_build_containers_registry_namespace: podified-master-centos9
+      cifmw_install_yamls_vars_patch_registry_url:
+        DATAPLANE_REGISTRY_URL: quay.io/podified-master-centos9
+
+- job:
+    name: tcib-podified-multinode-edpm-deployment-crc-master
     parent: podified-multinode-edpm-deployment-crc
     dependencies:
-      - openstack-meta-content-provider
+      - tcib-openstack-meta-content-provider-master
     irrelevant-files: &irrelevant_files
       - HACKING.rst
       - AUTHORS
@@ -19,6 +32,14 @@
       - LICENSE
       - OWNERS*
     vars: &edpm_vars
+      cifmw_repo_setup_branch: master
+      cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
+      cifmw_bop_openstack_release: master
+      cifmw_set_openstack_containers_namespace: podified-master-centos9
+      cifmw_update_containers_org: podified-master-centos9
+      cifmw_build_containers_registry_namespace: podified-master-centos9
+      cifmw_install_yamls_vars_patch_registry_url:
+        DATAPLANE_REGISTRY_URL: quay.io/podified-master-centos9
       cifmw_run_test_role: test_operator
       cifmw_test_operator_stages:
         - name: tempest
@@ -30,20 +51,28 @@
         tempest.scenario.test_network_basic_ops.TestNetworkBasicOps
 
 - job:
-    name: tcib-crc-podified-edpm-baremetal
+    name: tcib-crc-podified-edpm-baremetal-master
     parent: cifmw-crc-podified-edpm-baremetal
     dependencies:
-      - openstack-meta-content-provider
+      - tcib-openstack-meta-content-provider-master
     irrelevant-files: *irrelevant_files
     vars: *edpm_vars
 
 - job:
-    name: tcib-podified-multinode-edpm-deployment-crc-tobiko
+    name: tcib-podified-multinode-edpm-deployment-crc-tobiko-master
     parent: tcib-podified-multinode-edpm-deployment-crc
     files:
       - ^container-images/tcib/base/tobiko/
       - ^zuul.d/
     vars:
+      cifmw_repo_setup_branch: master
+      cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
+      cifmw_bop_openstack_release: master
+      cifmw_set_openstack_containers_namespace: podified-master-centos9
+      cifmw_update_containers_org: "podified-master-centos9"
+      cifmw_build_containers_registry_namespace: podified-master-centos9
+      cifmw_install_yamls_vars_patch_registry_url:
+        DATAPLANE_REGISTRY_URL: quay.io/podified-master-centos9
       cifmw_test_operator_stages:
         - name: tobiko
           type: tobiko

zuul.d/projects.yaml

@@ -3,7 +3,7 @@
     name: openstack-k8s-operators/tcib
     github-check:
       jobs:
-        - openstack-meta-content-provider:
+        - tcib-openstack-meta-content-provider-master:
             irrelevant-files: &if
               - HACKING.rst
               - AUTHORS
@@ -18,9 +18,9 @@
               - .coveragerc
               - LICENSE
               - OWNERS*
-        - tcib-crc-podified-edpm-baremetal:
+        - tcib-crc-podified-edpm-baremetal-master:
             irrelevant-files: *if
-        - tcib-podified-multinode-edpm-deployment-crc:
+        - tcib-podified-multinode-edpm-deployment-crc-master:
             irrelevant-files: *if
-        - tcib-podified-multinode-edpm-deployment-crc-tobiko:
+        - tcib-podified-multinode-edpm-deployment-crc-tobiko-master:
             irrelevant-files: *if