From bbef0481689ab8bd4082547add38f3fcaddbb223 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 20 May 2025 11:32:37 +0530 Subject: [PATCH] Port CS10 master github-check job to cs10 Based on https://github.com/openstack-k8s-operators/watcher-operator/pull/159#issuecomment-2893051014, meta content provider is working on CS10. This pr ports the same to CS10. Resolves: OSPRH-16773 Signed-off-by: Chandan Kumar (raukadah) --- .zuul.yaml | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 136db359..0a0e564f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -219,18 +219,35 @@ - job: name: openstack-meta-content-provider-master description: | - A zuul job building content from OpenDev master release. + A zuul job building content from OpenDev master release on CentOS Stream 10. + nodeset: centos-stream-10-vexxhost parent: openstack-meta-content-provider vars: - cifmw_operator_build_meta_build: false cifmw_bop_openstack_release: master - cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master" + cifmw_operator_build_meta_build: false + cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos10-master" cifmw_repo_setup_branch: master - cifmw_build_containers_registry_namespace: podified-master-centos9 - + cifmw_build_containers_registry_namespace: podified-master-centos10 + cifmw_build_containers_containers_base_image: quay.io/centos/centos:stream10 + cifmw_repo_setup_promotion: current + cifmw_repo_setup_dist_major_version: 10 + cifmw_build_containers_force: true + cifmw_build_containers_image_tag: watcher_latest + cifmw_bop_initial_dlrn_config: centos10-stream + cifmw_bop_dlrn_target: centos10-stream + cifmw_bop_dlrn_from_source: true + cifmw_operator_build_operators: + - name: watcher-operator + src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/watcher-operator" + - name: openstack-operator + src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator" - job: name: watcher-operator-validation-master parent: watcher-operator-validation-base + # Note(Chandankumar): Make it voting once + # github.com/openstack-k8s-operators/watcher-operator/pull/168#issuecomment-2897402858 + # resolves. + voting: false description: | A Zuul job consuming content from openstack-meta-content-provider-master and deploying EDPM with master content. @@ -238,7 +255,19 @@ cifmw_repo_setup_branch: master # To consume containers from meta content provider cifmw_update_containers_openstack: true - cifmw_update_containers_org: podified-master-centos9 + cifmw_update_containers_org: podified-master-centos10 + fetch_dlrn_hash: false + watcher_services_tag: watcher_latest + watcher_registry_url: "{{ content_provider_os_registry_url }}" + cifmw_update_containers_tag: watcher_latest + cifmw_update_containers_registry: "{{ content_provider_os_registry_url | split('/') | first }}" + cifmw_test_operator_tempest_image_tag: watcher_latest + + extra-vars: + # Override zuul meta content provider provided content_provider_dlrn_md5_hash + # var. As returned dlrn md5 hash comes from master release but job is using + # antelope content. + content_provider_dlrn_md5_hash: '' ########################################################## # #