From 9a7e48d2516351a227473d1ac5768c74734f01b3 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 29 Sep 2026 10:17:09 +0200 Subject: [PATCH 1/2] zuul: use s2i_extras in the multinode-ceph job When cifmw_extras, one of the included defined in the base ceph job is lost (@scenarios/centos-9/hci_ceph_backends.yml). But s2i_extras allows child jobs to add additional extra variables. Depends-On: https://github.com/openstack-k8s-operators/s2i-openstack-containers/pull/200 Signed-off-by: Luigi Toscano --- .zuul.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1958e8894..ba2d0cf25 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -167,6 +167,7 @@ changeRefspec: "e98dfff4bacdaeffe1fa79d3cfd5f2e28002cd98" cifmw_test_operator_tempest_include_list: | cyborg_tempest_plugin + - job: name: nova-operator-tempest-multinode-ceph parent: s2i-test-base-ceph @@ -177,8 +178,7 @@ post-run: - ci/nova-operator-base/playbooks/collect-logs.yaml vars: - cifmw_extras: - - "@scenarios/centos-9/multinode-ci.yml" + s2i_extras: - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode-ceph/ci_fw_vars.yaml" # dedupe this later cifmw_run_test_role: test_operator @@ -195,7 +195,6 @@ cifmw_test_operator_tempest_namespace: openstack-s2i-containers cifmw_test_operator_tempest_image_tag: master-latest cifmw_test_operator_tempest_container: openstack-tempest - s2i_cinder_volume_backends: ['volume1'] # NOTE(gibi): identity.v3_endpoint_type override is a WA to force the # publicURL as otherwise tempest gets configured with adminURL and that # causes test instability. @@ -269,11 +268,6 @@ - placement/placement-api - cyborg/cyborg - cyborg/cyborg-agent - # NOTE(amartyasinha): s2i_cinder_volume_backends overrides - # cinder-volume to the local content-provider image, so build it - # here. Alt: check how the image override resolves and set a quay - # ref to avoid building cinder-volume in nova-operator. - - cinder/cinder-volume - project: name: openstack-k8s-operators/nova-operator From d62123648a9dccb74be3beb9c3dc50b51dca95b3 Mon Sep 17 00:00:00 2001 From: Amartya Sinha Date: Tue, 6 Oct 2026 21:17:36 +0530 Subject: [PATCH 2/2] Switch component (tempest) jobs to use CS10 Since we've CS10 nodesets available openstack-k8s-operators/ci-framework#4163, let's use them Signed-off-by: Amartya Sinha --- .zuul.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index ba2d0cf25..d9e596b56 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -85,7 +85,7 @@ parent: s2i-test-base # Pin the nodeset on the job so every consumer inherits it, including # cyborg (via parent) and the s2i-component-jobs template. - nodeset: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-22-1-3xl + nodeset: centos-10-medium-2x-centos-10-crc-cloud-ocp-4-22-1-3xl dependencies: - openstack-k8s-operators-content-provider - workloads-s2i-content-provider @@ -93,7 +93,8 @@ - ci/nova-operator-base/playbooks/collect-logs.yaml vars: cifmw_extras: - - "@scenarios/centos-9/multinode-ci.yml" + - "@scenarios/centos-10/base.yml" + - "@scenarios/centos-10/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode/ci_fw_vars.yaml" cifmw_run_test_role: test_operator cifmw_test_operator_tempest_concurrency: 4 @@ -156,7 +157,8 @@ parent: nova-operator-tempest-multinode vars: cifmw_extras: - - "@scenarios/centos-9/multinode-ci.yml" + - "@scenarios/centos-10/base.yml" + - "@scenarios/centos-10/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-cyborg-tempest-multinode/ci_fw_vars.yaml" # The s2i master tempest image is inherited from # nova-operator-tempest-multinode. @@ -285,7 +287,7 @@ - nova-operator-kuttl-placement - nova-operator-tempest-multinode - nova-operator-tempest-multinode-ceph: - nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-22-1-3xl + nodeset: centos-10-medium-centos-10-crc-cloud-ocp-4-22-1-3xl - nova-operator-cyborg-tempest-multinode: voting: false files: