diff --git a/.zuul.yaml b/.zuul.yaml index d8af0c8a8..3a7e7ed74 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -13,7 +13,7 @@ parent: cifmw-podified-multinode-edpm-base-crc abstract: true attempts: 1 - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: ["openstack-meta-content-provider"] required-projects: - github.com/openstack-k8s-operators/ci-framework - github.com/openstack-k8s-operators/install_yamls @@ -27,7 +27,7 @@ - job: name: nova-operator-kuttl parent: nova-operator-base - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: ["openstack-meta-content-provider"] roles: - zuul: github.com/openstack-k8s-operators/ci-framework description: | @@ -75,11 +75,12 @@ - job: name: nova-operator-tempest-multinode parent: podified-multinode-edpm-deployment-crc-3comp - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: ["openstack-meta-content-provider"] nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-3xl post-run: - ci/nova-operator-base/playbooks/collect-logs.yaml vars: + cifmw_repo_setup_branch: master cifmw_extras: - "@scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode/ci_fw_vars.yaml" @@ -133,12 +134,13 @@ - job: name: nova-operator-tempest-multinode-ceph parent: podified-multinode-hci-deployment-crc-3comp - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: ["openstack-meta-content-provider"] nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-3xl # Note: When inheriting from a job (or creating a variant of a job) vars are merged with previous definitions post-run: - ci/nova-operator-base/playbooks/collect-logs.yaml vars: + cifmw_repo_setup_branch: master cifmw_extras: - "@scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode-ceph/ci_fw_vars.yaml" @@ -206,7 +208,10 @@ name: openstack-k8s-operators/nova-operator github-check: jobs: - - openstack-k8s-operators-content-provider - - nova-operator-kuttl + - openstack-meta-content-provider: + vars: + cifmw_bop_openstack_release: master + cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master" + cifmw_repo_setup_branch: master - nova-operator-tempest-multinode - nova-operator-tempest-multinode-ceph