Skip to content

Use s2i_extras instead of cifmw_extras - #777

Open
slagle wants to merge 1 commit into
openstack-k8s-operators:mainfrom
slagle:s2i_extras
Open

slagle wants to merge 1 commit into
openstack-k8s-operators:mainfrom
slagle:s2i_extras

Conversation

@slagle

@slagle slagle commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

s2i_extras was added in
openstack-k8s-operators/s2i-openstack-containers#200
and we can make use of it.

Jira: OSPRH-37786
Signed-off-by: James Slagle jslagle@redhat.com

@openshift-ci
openshift-ci Bot requested review from abays and stuggi October 27, 2026 11:52
@openshift-ci

openshift-ci Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: slagle

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@coderabbitai

coderabbitai Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

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

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Central YAML (base), Organization UI (inherited)
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 2ea6d41b-0cd1-46bd-93ed-bc5169b65015
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

@centosinfra-prod-github-app

Copy link
Copy Markdown

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/0f385a647b0440a0aac400938450543c

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 15m 28s
❌ heat-operator-tempest-multinode FAILURE in 1h 02m 15s
✔️ heat-s2i-content-provider SUCCESS in 10h 34m 03s (non-voting)
❌ heat-s2i-test FAILURE in 1h 12m 26s (non-voting)

Warning:
File ansible/tmp/a442b2c2da3c4a8b8b44b2562a870aa1 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/c3db5ea8d6dd4073af1f0064e9eae268 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/df7bbaa3cf22412bb192c700a242d1e8 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/1ebb92c9e2344391b50d434989e4c13f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a442b2c2da3c4a8b8b44b2562a870aa1 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/2bd1076322e64eb991838f04eadffc65 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/df67b7b154e24f4cbb1d152beedd88f7 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/937771b34f7f4c28aeb77c95cd787f24 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/bed9fbfd07704dbbaf085b585afdb310 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/2bd1076322e64eb991838f04eadffc65 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/config found in build home directory during playbook github.com/openstack-k8s-operators/s2i-openstack-containers/playbooks/container-ci/zuul/pre.yaml for job heat-s2i-content-provider. Add to preserve-home-paths if safe, or otherwise remove.

Comment thread zuul.d/jobs.yaml Outdated
vars: &heat_cifmw_test_operator_vars
change_item: "{{ zuul['items'] | selectattr('project.canonical_name', 'equalto', external_plugin) }}"
cifmw_extras:
s2i_extras:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Renaming cifmw_extras to s2i_extras inside the &heat_cifmw_test_operator_vars anchored block breaks heat-operator-tempest-multinode, which inherits the vars and heat is not enabled.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also, I'm still wondering why we need both the old and s2i job as I see that both are testing the same thing. The only difference I can see is s2i job builds the heat service images from s2i-openstack-containers main whereas the old job uses the already quay pushed image with the same source commit hash. Only difference is s2i job uses centos10 nodeset + 2 computes for the job.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

By the old job, I assume you mean heat-operator-tempest-multinode? Yea, I guess there is very little difference here. I'll check with the s2i working group and see what the long term plan here is.

@centosinfra-prod-github-app

Copy link
Copy Markdown

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

while scanning a simple key
in "openstack-k8s-operators/heat-operator/zuul.d/jobs.yaml@main", line 85, column 7
could not find expected ':'
in "openstack-k8s-operators/heat-operator/zuul.d/jobs.yaml@main", line 87, column 1

s2i_extras was added in
openstack-k8s-operators/s2i-openstack-containers#200
and we can make use of it.

Jira: OSPRH-37786
Signed-off-by: James Slagle <jslagle@redhat.com>
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build succeeded (check pipeline).
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/02d6f75cfb6e49acb197758314df7a28

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 53m 44s
✔️ heat-operator-tempest-multinode SUCCESS in 1h 25m 54s
✔️ heat-s2i-content-provider SUCCESS in 3h 51m 20s (non-voting)
❌ heat-s2i-test FAILURE in 1h 19m 12s (non-voting)

Warning:
File ansible/tmp/0cb6f9a4622248c6ab018f3896f78fcd found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/094b1400ddeb47f7a4231f909aea558d found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/ccd86677c8d64262b97a537cbdaa66f7 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/f59aeffd8df34fd6b93b101e315fe75e found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/0cb6f9a4622248c6ab018f3896f78fcd found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/config found in build home directory during playbook github.com/openstack-k8s-operators/s2i-openstack-containers/playbooks/container-ci/zuul/pre.yaml for job heat-s2i-content-provider. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/907f6f8b00df4535abab39df2495f602 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/b22ec87abef4495cbbabf84c00bc30bc found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/907f6f8b00df4535abab39df2495f602 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/b22ec87abef4495cbbabf84c00bc30bc found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/907f6f8b00df4535abab39df2495f602 found in build home directory during playbook review.rdoproject.org/config/playbooks/crc/print-machineconfigpool.yaml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.

@slagle

slagle commented Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

recheck

looks like resource usage issue

@slagle

slagle commented Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

/hold

consolidating the jobs here:
#780

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build succeeded (check pipeline).
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/e32828746ac94c4d80c005ee0d93ff4b

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 06m 08s
✔️ heat-operator-tempest-multinode SUCCESS in 1h 17m 13s
✔️ heat-s2i-content-provider SUCCESS in 5h 36m 31s (non-voting)
❌ heat-s2i-test FAILURE in 1h 10m 18s (non-voting)

Warning:
File ansible/tmp/858408c89a36450495f24ff6635e7dfc found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a2f6bcf8688c4dde940bb3d32c646d5f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/858408c89a36450495f24ff6635e7dfc found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a2f6bcf8688c4dde940bb3d32c646d5f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/858408c89a36450495f24ff6635e7dfc found in build home directory during playbook review.rdoproject.org/config/playbooks/crc/print-machineconfigpool.yaml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job heat-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/093495ba68174bb29d4f6afd6b54ae0f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/bf2e32242a1642f0a8dc3460fa867ba5 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a1aa6a8fcc664398a7fde5432497020d found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/29b7325ab1af40909ca6d3dd3d2a3ff1 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/093495ba68174bb29d4f6afd6b54ae0f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job heat-s2i-test. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/config found in build home directory during playbook github.com/openstack-k8s-operators/s2i-openstack-containers/playbooks/container-ci/zuul/pre.yaml for job heat-s2i-content-provider. Add to preserve-home-paths if safe, or otherwise remove.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants