From ab7dac8933b55e84669b0bb6ef663adb573a0fa9 Mon Sep 17 00:00:00 2001 From: Grzegorz Grasza Date: Tue, 9 Jun 2026 09:27:29 +0200 Subject: [PATCH 1/2] ci: add openstack-meta-content-provider-master job Add keystone-openstack-meta-content-provider-master to build fresh keystone containers from OpenDev master on each PR, and a corresponding keystone-operator-tempest-master job that consumes those containers. This allows co-submitting keystone service fixes and operator changes in the same review round, without waiting for the service fix to be packaged into current-tested first. Follows the pattern established by telemetry-operator (#894) and watcher-operator. Story: https://redhat.atlassian.net/browse/OSPRH-30892 Assisted-by: Claude Sonnet 4.6 Change-Id: Ib64787222c8e8818745d4d3a27a4da24f5901184 Signed-off-by: Grzegorz Grasza --- zuul.d/jobs.yaml | 39 +++++++++++++++++++++++++++++++++++++++ zuul.d/projects.yaml | 5 +++++ 2 files changed, 44 insertions(+) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 94f8efaa..215e9a65 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -26,3 +26,42 @@ cifmw_test_operator_tempest_concurrency: 3 cifmw_test_operator_tempest_include_list: | ^tempest.api.identity. + +- job: + name: keystone-openstack-meta-content-provider-master + parent: openstack-meta-content-provider-master + description: | + A meta content provider zuul job to build keystone + specific containers from OpenDev master. + vars: + cifmw_build_containers_force: true + cifmw_bop_dlrn_from_source: true + cifmw_build_containers_registry_namespace: podified-master-centos10 + cifmw_operator_build_operators: + - name: keystone-operator + src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/keystone-operator" + - name: openstack-operator + src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator" + image_base: keystone + cifmw_build_containers_image_tag: keystone_latest + cifmw_build_containers_exclude_containers: + master: + centos10: + - horizontest + +- job: + name: keystone-operator-tempest-master + parent: keystone-operator-tempest + dependencies: + - keystone-openstack-meta-content-provider-master + description: | + Deploy OpenStack with fresh keystone containers built from master. + extra-vars: + content_provider_dlrn_md5_hash: '' + vars: + cifmw_repo_setup_branch: master + fetch_dlrn_hash: false + cifmw_update_containers_openstack: true + cifmw_update_containers_org: podified-master-centos10 + cifmw_update_containers_tag: keystone_latest + cifmw_test_operator_tempest_image_tag: keystone_latest diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 168e8830..0ede0aee 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -3,6 +3,11 @@ name: openstack-k8s-operators/keystone-operator github-check: jobs: + # jobs using latest available code - local registry, tag: keystone_latest + - keystone-openstack-meta-content-provider-master + - keystone-operator-tempest-master: + voting: false + # jobs using latest stable code - tag: current-podified - openstack-k8s-operators-content-provider: vars: cifmw_install_yamls_sdk_version: v1.41.1 From 8908dda79c862b60f56e3b9c6d666a33f74403e3 Mon Sep 17 00:00:00 2001 From: Grzegorz Grasza Date: Wed, 10 Jun 2026 12:19:09 +0200 Subject: [PATCH 2/2] ci: make meta-content-provider jobs non-voting Set cifmw_build_containers_force: false so the build only triggers when a Depends-On to OpenDev is present, not on every PR. Also mark keystone-openstack-meta-content-provider-master as non-voting to avoid blocking PRs on unrelated upstream issues. Change-Id: Id66a272d2cd204c168837e421fc9025cfc869e09 Signed-off-by: Grzegorz Grasza --- zuul.d/jobs.yaml | 2 +- zuul.d/projects.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 215e9a65..963ca7fc 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -34,7 +34,7 @@ A meta content provider zuul job to build keystone specific containers from OpenDev master. vars: - cifmw_build_containers_force: true + cifmw_build_containers_force: false cifmw_bop_dlrn_from_source: true cifmw_build_containers_registry_namespace: podified-master-centos10 cifmw_operator_build_operators: diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 0ede0aee..46090983 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -4,7 +4,8 @@ github-check: jobs: # jobs using latest available code - local registry, tag: keystone_latest - - keystone-openstack-meta-content-provider-master + - keystone-openstack-meta-content-provider-master: + voting: false - keystone-operator-tempest-master: voting: false # jobs using latest stable code - tag: current-podified