[ci] Speculative s2i cinder deploy via OpenStackVersion by rebtoor · Pull Request #711 · openstack-k8s-operators/cinder-operator

rebtoor · 2026-08-25T09:46:14Z

Summary

Add cinder-s2i-content-provider, a child of s2i-openstack-container-content-provider, with an explicit cinder image list (cinder-api, cinder-backup, cinder-scheduler, cinder-volume).
Add cinder-s2i-tempest, a child of cinder-operator-tempest, that applies those s2i images to OpenStackVersion during edpm_prepare via cifmw_set_containers_images.
Keep the operator content provider for the catalog and append the s2i registry as extra insecure/allowed so CRC can pull both.
Inject mapped API/backup/scheduler images from the s2i provider, and set cinderVolumeImages.volume1 for the HCI CinderVolume (volume backends are a map, not a scalar).

Test plan

github-check schedules cinder-s2i-content-provider and cinder-s2i-tempest (voting: false)
OpenStackVersion customContainerImages includes s2i cinderAPIImage, cinderBackupImage, cinderSchedulerImage, and cinderVolumeImages.volume1
Existing cinder-operator-kuttl and cinder-operator-tempest still consume only the operator content provider

openshift-ci · 2026-08-25T09:46:20Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rebtoor
Once this PR has been reviewed and has the lgtm label, please assign dprince for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

coderabbitai · 2026-08-25T09:46:22Z

Important

🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: d376ea24-e4ad-49c0-8eb6-5743bddae9c2

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

centosinfra-prod-github-app · 2026-08-25T09:46:37Z

Zuul encountered a syntax error while parsing its
configuration in the repo openstack-k8s-operators/cinder-operator on branch main. The
problem was:

Invalid Ansible variable name '_s2i_cinder_scalar_images' for dictionary value @ data['vars']

The problem appears in the "s2i-speculative-deploy-test-cinder" job stanza:

job:
name: s2i-speculative-deploy-test-cinder
parent: cinder-operator-tempest
description: |
Validate speculatively-built s2i cinder images against a live
HCI OpenStack deployment with Ceph. s2i-built images from the
content provider are applied to OpenStackVersion during
edpm_prepare via ci-framework set_containers before the control
plane is deployed.
...

in "openstack-k8s-operators/cinder-operator/zuul.d/jobs.yaml@main", line 48

centosinfra-prod-github-app · 2026-08-25T09:48:27Z

This change depends on a change that failed to merge.

Change openstack-k8s-operators/s2i-openstack-containers#91 is needed.

rebtoor · 2026-08-25T09:51:56Z

recheck

Add cinder-s2i-content-provider (child of the s2i content provider) and cinder-s2i-tempest (child of cinder-operator-tempest) so github-check builds s2i cinder images and applies them through cifmw_set_containers_images during edpm_prepare. Keep the operator content provider for the catalog and append the s2i registry so CRC can pull both. cinder-volume is applied as cinderVolumeImages.volume1 because OpenStackVersion stores volume backends as a map. Depends-On: openstack-k8s-operators/s2i-openstack-containers#91 Depends-On: openstack-k8s-operators/ci-framework#4131 Co-authored-by: Cursor <cursoragent@cursor.com>

centosinfra-prod-github-app · 2026-08-25T13:21:42Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/6d523145a0b348749927f46a3ee113a4

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 55s
✔️ cinder-operator-kuttl SUCCESS in 47m 36s
❌ cinder-operator-tempest FAILURE in 1h 44m 27s
✔️ cinder-s2i-content-provider SUCCESS in 1h 55m 31s (non-voting)
❌ cinder-s2i-tempest FAILURE in 1h 47m 50s (non-voting)

rebtoor · 2026-08-25T13:49:16Z

The job itself worked: https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/logs//239/rdoproject.org/239b0144eee04614bf2edd4e13f06dbc/controller/ci-framework-data/logs/openstack-must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-7c4e74411335a883ab800a2f1812e725a15ea42bdf17bba8192fc315f7f72332/namespaces/openstack/crs/openstackversions.core.openstack.org/controlplane.yaml

The controlplane has been patched to consume images from the s2i content provider:

spec:
  customContainerImages:
    cinderAPIImage: xxx.xxx.xxx.xxx:5001/openstack/openstack-cinder-api:711-dc2596fe64f90e55fe3cbeb89d69f4b075a8b784
    cinderBackupImage: xxx.xxx.xxx.xxx:5001/openstack/openstack-cinder-backup:711-dc2596fe64f90e55fe3cbeb89d69f4b075a8b784
    cinderSchedulerImage: xxx.xxx.xxx.xxx:5001/openstack/openstack-cinder-scheduler:711-dc2596fe64f90e55fe3cbeb89d69f4b075a8b784
    cinderVolumeImages:
      volume1: xxx.xxx.xxx.xxx:5001/openstack/openstack-cinder-volume:711-dc2596fe64f90e55fe3cbeb89d69f4b075a8b784

The failure is probably caused by ceph and solved by openstack-k8s-operators/ci-framework#4130 . Retesting it with a depends-on.

rebtoor · 2026-08-25T13:49:51Z

recheck

centosinfra-prod-github-app · 2026-08-25T17:06:12Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/a7d957c514db443b983e911c1a9ea7ef

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 46m 16s
✔️ cinder-operator-kuttl SUCCESS in 47m 47s
❌ cinder-operator-tempest FAILURE in 1h 21m 09s
✔️ cinder-s2i-content-provider SUCCESS in 3h 14m 38s (non-voting)
❌ cinder-s2i-tempest FAILURE in 1h 24m 26s (non-voting)

rebtoor · 2026-08-26T19:28:17Z

recheck

centosinfra-prod-github-app · 2026-08-26T19:28:49Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/ci-framework for 4130,c07d8d4f7727303ceccc711beb282ccb51374fe2

rebtoor · 2026-08-26T19:30:42Z

recheck

tosky · 2026-08-26T21:50:05Z

+
+- job:
+    name: cinder-s2i-tempest
+    parent: cinder-operator-tempest


Instead of inheriting from the existing tempest job, I think we should have a generic base parent job for such tests. Not all repositories may have an existing tempest job.
So the idea would be to define a generic job, currently inheriting from podified-multinode-hci-deployment-crc-1comp-backends, which would define most of the variables, for sure cifmw_crc_additional_insecure_registries, cifmw_crc_additional_allowed_registries and the default value of cifmw_set_containers_images, which would combine the part which we want in all jobs ("scalar OpenStackVersion fields from the s2i provider") plus an optional part, say cifmw_set_containers_images_extra, that some jobs like this cinder or manila one can override.

I'm going to refine it and it probably does not work now, but this is a draft with the split parent job:

openstack-k8s-operators/glance-operator#992

In addition/extending what I wrote above, two other points (I've mentioned them privately but better have them here too):

I think we would need that generic job as "root" job as described above, but not based on podified-multinode-hci-deployment-crc-1comp-backends, but rather without ceph; and a secondary one with ceph.

also, the variable which defines the additional containers (like cinder-volume and manila-share) could be just defined as a list/dictionary of names as it was before, and the base jobs should do the magic of changing the list into the appropriate structure. This would simplify the definition of the derived jobs.

openshift-ci Bot requested review from dprince and eharney August 25, 2026 09:46

rebtoor marked this pull request as draft August 25, 2026 09:47

openshift-ci Bot added the do-not-merge/work-in-progress label Aug 25, 2026

rebtoor force-pushed the feature/s2i-speculative-test branch from de8bba4 to 7eded60 Compare August 25, 2026 09:47

rebtoor force-pushed the feature/s2i-speculative-test branch from 7eded60 to ae19640 Compare August 25, 2026 10:10

rebtoor force-pushed the feature/s2i-speculative-test branch from ae19640 to dc2596f Compare August 25, 2026 10:11

rebtoor marked this pull request as ready for review August 25, 2026 14:02

openshift-ci Bot removed the do-not-merge/work-in-progress label Aug 25, 2026

openshift-ci Bot requested a review from abays August 25, 2026 14:02

tosky reviewed Aug 26, 2026

View reviewed changes

Uh oh!

Conversation

rebtoor commented Aug 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

openshift-ci Bot commented Aug 25, 2026

Uh oh!

coderabbitai Bot commented Aug 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

centosinfra-prod-github-app Bot commented Aug 25, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 25, 2026

Uh oh!

rebtoor commented Aug 25, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 25, 2026

Uh oh!

rebtoor commented Aug 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rebtoor commented Aug 25, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 25, 2026

Uh oh!

rebtoor commented Aug 26, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 26, 2026

Uh oh!

rebtoor commented Aug 26, 2026

Uh oh!

tosky Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

tosky Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

tosky Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rebtoor commented Aug 25, 2026 •

edited

Loading

coderabbitai Bot commented Aug 25, 2026 •

edited

Loading

rebtoor commented Aug 25, 2026 •

edited

Loading