From ee3bb96f8f503b920189d0cd58c76ae9d4241ee5 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Fri, 15 May 2026 11:45:09 +0200 Subject: [PATCH 1/2] Use container images with latest code in meta-content-provider-master We would like to start using container images that are done with latest code available in the repository instead of relay on current-tested tag. Also improved zuul configuration file: What changed: - added comments that what job uses which component tag - changed python list style to yaml list - applied same CI job vars as it is done in watcher [1] - improved tempest vars [1] https://github.com/openstack-k8s-operators/watcher-operator/blob/main/.zuul.yaml Depends-On: https://review.opendev.org/c/openstack/barbican/+/990084 Signed-off-by: Daniel Pawlik --- ci/files/containers.yaml | 17 ------------ ci/vars-cloudkitty-tempest.yml | 22 +++++++++++++--- zuul.d/projects.yaml | 48 ++++++++++++++++++++++------------ 3 files changed, 50 insertions(+), 37 deletions(-) delete mode 100644 ci/files/containers.yaml diff --git a/ci/files/containers.yaml b/ci/files/containers.yaml deleted file mode 100644 index f29b85ac5..000000000 --- a/ci/files/containers.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# tcib container images used by cloudops team for telemetry testing -container_images: -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-aodh-api:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-aodh-evaluator:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-aodh-listener:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-aodh-notifier:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-central:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-compute:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-notification:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-ipmi:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-heat-api-cfn:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-heat-api:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-heat-engine:current-tested -- imagename: quay.rdoproject.org/podified-master-centos10/openstack-tempest-all:current-tested diff --git a/ci/vars-cloudkitty-tempest.yml b/ci/vars-cloudkitty-tempest.yml index 140b80d58..e77b17b86 100644 --- a/ci/vars-cloudkitty-tempest.yml +++ b/ci/vars-cloudkitty-tempest.yml @@ -23,15 +23,31 @@ pre_deploy_loki_setup: # test cloudkitty cifmw_run_tests: true cifmw_run_test_role: test_operator -# TODO: Consider switching to podified-master-centos10 for features that patch master -cifmw_test_operator_tempest_namespace: podified-antelope-centos9 # cloudkitty tempest plugin is not part of the tempest rpm. # https://review.rdoproject.org/cgit/openstack/tempest-distgit/tree/openstack-tempest.spec # We need to add the cloudkitty-tempest-plugin package to RDO, same as TTTP # https://review.rdoproject.org/cgit/openstack/telemetry-tempest-plugin-distgit/# # For now, we can force install using the cifmw_test_operator_tempest_external_plugin below. cifmw_test_operator_tempest_container: openstack-tempest-all -cifmw_test_operator_tempest_image_tag: 'current-podified' +# Based on https://github.com/openstack-k8s-operators/watcher-operator/blob/main/ci/tests/watcher-tempest.yml +cifmw_test_operator_tempest_registry: >- + {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%} + {{ content_provider_os_registry_url | split('/') | first }} + {%- else -%} + quay.io + {%- endif -%} +cifmw_test_operator_tempest_namespace: >- + {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%} + {{ content_provider_os_registry_url | split('/') | last }} + {%- else -%} + podified-antelope-centos9 + {%- endif -%} +cifmw_test_operator_tempest_image_tag: >- + {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%} + {{ cifmw_update_containers_tag | default('telemetry_latest') }} + {%- else -%} + current-podified + {%- endif -%} # This value is used to populate the `tempestconfRun` parameter of the Tempest CR: https://openstack-k8s-operators.github.io/test-operator/crds.html#tempest-custom-resource # https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml # TODO: Refine this tempest config diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 93ac23936..4f1c079bb 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1,3 +1,4 @@ +--- - job: name: telemetry-openstack-meta-content-provider-master parent: openstack-meta-content-provider-master @@ -5,7 +6,6 @@ A meta content provider zuul job to build telemetry specific containers. vars: - cifmw_install_yamls_sdk_version: v1.41.1 # Note(Chandan Kumar): image_base is the operator name without -operator. # It is needed by openstack-operator to include telemetry operator images # in the openstack-operator catalog image. @@ -16,15 +16,16 @@ src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator" image_base: telemetry cifmw_build_containers_image_tag: telemetry_latest - zuul_project_container_path: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/telemetry-operator/ci/files/containers.yaml" - cifmw_build_containers_config_file: "{{ ansible_user_dir }}/containers.yaml" - # build tcib containers only when there is opendev depends-on - cifmw_build_containers_force: false + cifmw_build_containers_exclude_containers: + master: + centos10: + - horizontest - job: name: telemetry-operator-multinode-autoscaling parent: podified-multinode-edpm-deployment-crc - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: + - openstack-k8s-operators-content-provider description: | Deploy OpenStack with Autoscaling features enabled. vars: @@ -73,7 +74,8 @@ - job: name: telemetry-operator-multinode-default-telemetry parent: podified-multinode-edpm-deployment-crc - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: + - openstack-k8s-operators-content-provider description: | Deploy a default OpenStack with telemetry enabled, but without COO installed. Check that the telemetry-operator logs don't have any errors. extra-vars: &mcp_extra_vars @@ -95,7 +97,8 @@ - job: name: telemetry-operator-multinode-logging parent: podified-multinode-edpm-deployment-crc - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: + - openstack-k8s-operators-content-provider description: | Deploy OpenStack with Logging features enabled vars: @@ -107,7 +110,8 @@ - job: name: telemetry-operator-multinode-audit-logging parent: podified-multinode-edpm-deployment-crc - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: + - openstack-k8s-operators-content-provider description: | Deploy OpenStack with CADF audit logging enabled for supported services vars: @@ -119,7 +123,8 @@ - job: name: telemetry-operator-multinode-power-monitoring parent: podified-multinode-edpm-deployment-crc - dependencies: ["openstack-k8s-operators-content-provider"] + dependencies: + - openstack-k8s-operators-content-provider description: | Deploy OpenStack with power monitoring services enabled vars: @@ -130,17 +135,26 @@ - job: name: telemetry-operator-multinode-cloudkitty - dependencies: ["telemetry-openstack-meta-content-provider-master"] + dependencies: + - telemetry-openstack-meta-content-provider-master parent: telemetry-operator-multinode-autoscaling description: | - Deploy CloudKitty and run tempest tests + Deploy CloudKitty and run tempest tests - master + Basically it is a CI job that uses latest code coming + from master branch in related projects. required-projects: - name: infrawatch/feature-verification-tests override-checkout: master extra-vars: *mcp_extra_vars vars: #patch_observabilityclient: true - cifmw_update_containers: false + cifmw_repo_setup_branch: master + fetch_dlrn_hash: false + cifmw_update_containers: true + cifmw_update_containers_openstack: true + cifmw_update_containers_org: podified-master-centos10 + cifmw_update_containers_tag: telemetry_latest + cifmw_build_containers_force: true cifmw_extras: - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-cloudkitty-tempest.yml" @@ -180,13 +194,13 @@ name: openstack-k8s-operators/telemetry-operator github-check: jobs: + # jobs uses latest available code - local registry, tag: telemetry_latest + - telemetry-openstack-meta-content-provider-master + - telemetry-operator-multinode-cloudkitty + # jobs uses latest stable code - tag: current-podified - openstack-k8s-operators-content-provider: vars: cifmw_install_yamls_sdk_version: v1.41.1 - - telemetry-operator-multinode-cloudkitty: - dependencies: - - telemetry-openstack-meta-content-provider-master - - telemetry-openstack-meta-content-provider-master - telemetry-operator-multinode-default-telemetry - telemetry-operator-multinode-audit-logging - functional-tests-osp18: &fvt_jobs_config From 581c77b2f0603cbdd7d447f536f47233702b061a Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Fri, 29 May 2026 12:59:06 +0200 Subject: [PATCH 2/2] Move some variables to meta content job Some variables should belong to meta content job, not to the cloud kitty. --- zuul.d/projects.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 4f1c079bb..71d9b7c1c 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -9,6 +9,9 @@ # Note(Chandan Kumar): image_base is the operator name without -operator. # It is needed by openstack-operator to include telemetry operator images # in the openstack-operator catalog image. + cifmw_build_containers_force: true + cifmw_bop_dlrn_from_source: true + cifmw_build_containers_registry_namespace: podified-master-centos10 cifmw_operator_build_operators: - name: telemetry-operator src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/telemetry-operator" @@ -154,11 +157,9 @@ cifmw_update_containers_openstack: true cifmw_update_containers_org: podified-master-centos10 cifmw_update_containers_tag: telemetry_latest - cifmw_build_containers_force: true cifmw_extras: - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-cloudkitty-tempest.yml" - - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml" roles: - zuul: github.com/openstack-k8s-operators/ci-framework irrelevant-files: *irrelevant_files