From 752e2da3f5b0e8cd69e99d7465d1dac3b88fad07 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Fri, 21 Jun 2024 19:45:39 +0530 Subject: [PATCH] [DNM] meta content provider testing Signed-off-by: Chandan Kumar --- .zuul.yaml | 26 ++++++++++++++++++-------- api/bases/nova.openstack.org_nova.yaml | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 06d11bf10..97b8a7b0c 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,7 +75,7 @@ - job: name: nova-operator-tempest-multinode parent: podified-multinode-edpm-deployment-crc-3comp - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: ["openstack-meta-content-provider"] post-run: - ci/nova-operator-base/playbooks/collect-logs.yaml vars: @@ -128,7 +128,7 @@ - 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"] # 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 @@ -195,7 +195,17 @@ name: openstack-k8s-operators/nova-operator github-check: jobs: - - openstack-k8s-operators-content-provider - - nova-operator-kuttl - - nova-operator-tempest-multinode - - nova-operator-tempest-multinode-ceph + - 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-kuttl: + vars: + cifmw_repo_setup_branch: master + - nova-operator-tempest-multinode: + vars: + cifmw_repo_setup_branch: master + - nova-operator-tempest-multinode-ceph: + vars: + cifmw_repo_setup_branch: master diff --git a/api/bases/nova.openstack.org_nova.yaml b/api/bases/nova.openstack.org_nova.yaml index 3f41d982c..32bce7304 100644 --- a/api/bases/nova.openstack.org_nova.yaml +++ b/api/bases/nova.openstack.org_nova.yaml @@ -22,7 +22,7 @@ spec: properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest + of an objects. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string kind: