Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,26 +219,55 @@
- 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"
Comment on lines +239 to +243
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SeanMooney Hello, thank you for suggestion on this. And I tried above var but it seems to fail.
https://logserver.rdoproject.org/396/rdoproject.org/39611d73be954300a3c15218cdd039b4/job-output.txt

ASK [operator_build : watcher-operator - Get base module name from go.mod operator_base_module_name={{ go_mod_out['content'] | b64decode | regex_search(cifmw_operator_build_org + '/' + operator.name + '/(\w*)\s', '\1') | first }}] ***
2025-05-20 11:05:02.918210 | primary | Tuesday 20 May 2025  11:05:02 -0400 (0:00:00.261)       0:23:32.493 ***********
2025-05-20 11:05:02.918234 | primary | task path: /home/zuul-worker/src/github.com/openstack-k8s-operators/ci-framework/roles/operator_build/tasks/build.yml:27
2025-05-20 11:05:03.073385 | primary | fatal: [localhost]: FAILED! =>
2025-05-20 11:05:03.073483 | primary |     msg: 'Unexpected templating type error occurred on ({{ go_mod_out[''content''] | b64decode
2025-05-20 11:05:03.073634 | primary |       | regex_search(cifmw_operator_build_org + ''/'' + operator.name + ''/(\\w*)\\s'',
2025-05-20 11:05:03.073651 | primary |       ''\\1'') | first }}): ''NoneType'' object is not iterable. ''NoneType'' object is
2025-05-20 11:05:03.073664 | primary |       not iterable'

with watcher-operator, we wanted to avoid this task. that's why I was proposing this openstack-k8s-operators/ci-framework#2969 to exclude standalone operator.

In openstack-check side, it works fine as there is no github pr from operator side.

- 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.
vars:
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: ''

##########################################################
# #
Expand Down