Skip to content

Update chainsaw command to match kuttl capabilities#79648

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dciabrin:chainsaw-script-fix
May 26, 2026
Merged

Update chainsaw command to match kuttl capabilities#79648
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dciabrin:chainsaw-script-fix

Conversation

@dciabrin
Copy link
Copy Markdown
Contributor

@dciabrin dciabrin commented May 22, 2026

Update the shell script that triggers chainsaw tests for the openstack-k8s-operators:

  • Fixes the location of the test directory, which has now moved from 'tests' to 'test'

  • Add missing features which have been implemented in the equivalent kuttl shell script (e.g. depends-on, deployment wait...)

Summary by CodeRabbit

This PR updates the Chainsaw test step script for OpenStack K8s operators' CI pipeline to align with the kuttl test runner's capabilities and fix recent directory structure changes.

Practical Changes

Test Directory Structure Update: The script now references the correct test configuration paths, which have been reorganized from tests/chainsaw to test/chainsaw (singular directory). This affects how the CI system locates chainsaw configuration files (config.yaml) and test definitions.

PR Dependency Handling: The script now queries GitHub to check if the PR description includes a depends-on ... install_yamls reference. If found, it automatically fetches and checks out the matching install_yamls PR, allowing component tests to coordinate with supporting infrastructure changes.

Per-Service Test Reporting: Chainsaw reports are now named per-operator (chainsaw-report-${SERVICE_NAME}.json) instead of using a generic chainsaw-report.json, which better supports CI artifact collection and analysis across multiple services.

Improved OpenStack Deployment Testing: When testing the openstack-operator specifically, the script now:

  • Uses a stable base release image (quay.io/openstack-k8s-operators/openstack-operator-index:18.0-fr2-latest) for initial deployment instead of the build artifact
  • Adds explicit 60-second wait before patching osversion
  • Waits for openstackcontrolplane readiness using label selector core.openstack.org/openstackcontrolplane before proceeding

These changes enhance test stability and reliability by ensuring proper orchestration between operator deployments and test execution, particularly for upgrade scenarios.

Update the shell script that triggers chainsaw tests for the
openstack-k8s-operators:

  - Fixes the location of the test directory, which has now moved
    from 'tests' to 'test'

  - Add missing features which have been implemented in the equivalent
    kuttl shell script (e.g. depends-on, deployment wait...)

Signed-off-by: Damien Ciabrini <dciabrin@redhat.com>
@openshift-ci openshift-ci Bot requested review from dprince and frenzyfriday May 22, 2026 18:32
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 22, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 93a7495f-7d92-4103-9675-ff3e80e87949

📥 Commits

Reviewing files that changed from the base of the PR and between 768616a and 45e3772.

📒 Files selected for processing (1)
  • ci-operator/step-registry/openstack-k8s-operators/chainsaw/openstack-k8s-operators-chainsaw-commands.sh

Walkthrough

A single CI operator script for OpenStack-K8s-Operators chainsaw testing now detects and checks out dependent install_yamls pull requests via GitHub metadata, standardizes chainsaw configuration and reporting paths from tests/chainsaw to test/chainsaw, uses per-service report filenames, updates the default OpenStack operator image tag to 18.0-fr2-latest, and adds readiness validation for openstackcontrolplane before version patching.

Changes

Chainsaw CI Script Improvements

Layer / File(s) Summary
Dependency-aware install_yamls checkout
ci-operator/step-registry/openstack-k8s-operators/chainsaw/openstack-k8s-operators-chainsaw-commands.sh
Script queries GitHub API using JOB_SPEC to fetch PR body, extracts depends-on ... install_yamls references, then conditionally clones and checks out the referenced install_yamls PR branch.
Chainsaw configuration path standardization
ci-operator/step-registry/openstack-k8s-operators/chainsaw/openstack-k8s-operators-chainsaw-commands.sh
Chainsaw report filename changes to chainsaw-report-${SERVICE_NAME}.json, configuration and test directories updated from /tests/chainsaw to /test/chainsaw, and error message path updated accordingly.
OpenStack deployment enhancements
ci-operator/step-registry/openstack-k8s-operators/chainsaw/openstack-k8s-operators-chainsaw-commands.sh
Default OPENSTACK_IMG tag changed to quay.io/openstack-k8s-operators/openstack-operator-index:18.0-fr2-latest, and explicit 60-second delay plus oc wait readiness check for openstackcontrolplane added before openstack_patch_version step.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: updating the chainsaw command script to add features that match kuttl capabilities (depends-on support, wait behavior, etc.).
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only a CI orchestration shell script with no Ginkgo test declarations. Test code resides in external operator repositories, not in this release config repository.
Test Structure And Quality ✅ Passed Custom check requires reviewing Ginkgo test code patterns. PR modifies only a shell script for test orchestration, not Ginkgo test code. Check not applicable.
Microshift Test Compatibility ✅ Passed PR modifies only a bash shell script for test orchestration. No new Ginkgo e2e tests are added, so MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR does not add any new Ginkgo e2e tests. It only modifies a shell script that orchestrates chainsaw test execution in CI. Custom check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies a CI/CD shell script for chainsaw test orchestration, not deployment manifests or operator code. No scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed The OTE Binary Stdout Contract check applies to Go/Ginkgo test binaries, but this PR only modifies a bash shell script in the openshift/release repository, which is not a Go test binary.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only a bash shell script, not Ginkgo e2e tests. The custom check applies only to new Ginkgo test additions (It(), Describe(), etc.), which are not present in this PR.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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 and usage tips.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@dciabrin: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw openstack-k8s-operators/mariadb-operator presubmit Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 23, 2026

@lmiccini: changing LGTM is restricted to collaborators

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@lmiccini
Copy link
Copy Markdown
Contributor

/retest

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@lmiccini
Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@lmiccini: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@dciabrin
Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openstack-k8s-operators-mariadb-operator-main-mariadb-operator-build-deploy-chainsaw

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@dciabrin: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

Comment on lines +61 to +65
PR_BODY=$(curl -s -X GET \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/${REF_ORG}/${REF_REPO}/pulls/${PR_NUMBER} |
jq -r '.body')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since we're not authenticating here, are we at all worried about rate-limiting? Not a blocking issue, just want to get your opinion.

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.

Good point. I don't think this is an immediate concern, at least for chainsaw tests, because they are only available for the mariadb-operator.

That being said, I mimicked what we have in https://github.com/openshift/release/blob/main/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh for feature-parity, so we might want to think about this one as kuttl tests is used by a lot of operators.

Copy link
Copy Markdown
Member

@abays abays left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 26, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, dciabrin, lmiccini

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2026
@abays
Copy link
Copy Markdown
Member

abays commented May 26, 2026

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@abays: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 26, 2026
@abays
Copy link
Copy Markdown
Member

abays commented May 26, 2026

/test ci/prow/ci-operator-registry

@dciabrin
Copy link
Copy Markdown
Contributor Author

/test release-controller-config

@abays
Copy link
Copy Markdown
Member

abays commented May 26, 2026

/test pull-ci-openshift-release-main-ci-operator-registry

@abays
Copy link
Copy Markdown
Member

abays commented May 26, 2026

/test ci-operator-registry

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 26, 2026

@dciabrin: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@abays
Copy link
Copy Markdown
Member

abays commented May 26, 2026

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@abays: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot merged commit 0374714 into openshift:main May 26, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants