Skip to content

[ospk8s] Disable branch protection for branch 18-stable - #82623

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
stuggi:disable_zuul_18-stable
Jul 30, 2026
Merged

[ospk8s] Disable branch protection for branch 18-stable#82623
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
stuggi:disable_zuul_18-stable

Conversation

@stuggi

@stuggi stuggi commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

In order to save CI resources it has been decided to not run zuul jobs in 18-stable branch, only in master and 18.0-frX ones. We need to disable the branch protection for that to allow to merge changes.

This was done in 31831ab for watcher, this commit changes it for the other repos where branch protection is enabled.

Summary by CodeRabbit

  • Disables branch protection for the 18-stable branch in four ospk8s repositories:
    • ci-framework
    • data-plane-adoption
    • edpm-ansible
    • openstack-must-gather
  • Allows changes to merge without required Zuul jobs on these branches, conserving CI resources while keeping CI focused on master and 18.0-frX.

In order to save CI resources it has been decided to not run zuul jobs
in 18-stable branch, only in master and 18.0-frX ones. We need to
disable the branch protection for that to allow to merge changes.

This was done in 31831ab for watcher,
this commit changes it for the other repos where branch protection is
enabled.

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

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: Pro Plus

Run ID: eb6d6f9a-34a0-41a2-b282-e843ba4879ff

📥 Commits

Reviewing files that changed from the base of the PR and between 0454b2a and dae2640.

📒 Files selected for processing (4)
  • core-services/prow/02_config/openstack-k8s-operators/ci-framework/_prowconfig.yaml
  • core-services/prow/02_config/openstack-k8s-operators/data-plane-adoption/_prowconfig.yaml
  • core-services/prow/02_config/openstack-k8s-operators/edpm-ansible/_prowconfig.yaml
  • core-services/prow/02_config/openstack-k8s-operators/openstack-must-gather/_prowconfig.yaml

Walkthrough

Four Prow branch-protection configurations add explicit 18-stable overrides with protect: false for OpenStack Kubernetes Operators repositories.

Changes

18-stable branch protection overrides

Layer / File(s) Summary
Disable protection for 18-stable
core-services/prow/02_config/openstack-k8s-operators/{ci-framework,data-plane-adoption,edpm-ansible,openstack-must-gather}/_prowconfig.yaml
Adds an 18-stable branch rule with protect: false in each repository configuration; existing required status checks remain unchanged.

Estimated code review effort: 1 (Trivial) | ~5 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: disabling branch protection for the 18-stable branch.
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 only changes Prow branch-protection YAML; no Ginkgo tests or titles were added or modified.
Test Structure And Quality ✅ Passed No Ginkgo test code changed; the PR only updates Prow branch-protection YAML.
Microshift Test Compatibility ✅ Passed PASS: This PR only edits four Prow branch-protection YAML files; no Ginkgo tests or e2e code were added, so MicroShift compatibility is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only changes Prow branch-protection YAML; no Ginkgo e2e tests were added or modified, so SNO compatibility is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only Prow branch-protection YAML changed; no deployment manifests, operator code, or controllers were modified.
Ote Binary Stdout Contract ✅ Passed PR only updates four YAML prowconfig files to disable 18-stable branch protection; no process-level code or stdout writes changed.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only Prow branch-protection YAML was changed; no new Ginkgo e2e tests or network code were added, so the IPv6/disconnected check is not applicable.
No-Weak-Crypto ✅ Passed Changed files only add 18-stable branch-protection overrides; no MD5/SHA1/DES/RC4/ECB, custom crypto, or secret comparisons found.
Container-Privileges ✅ Passed Only Prow branch-protection YAMLs changed; no privileged, hostPID/network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings are present.
No-Sensitive-Data-In-Logs ✅ Passed Only branch-protection YAML changes; no log statements or sensitive fields appear in the modified files.
✨ 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.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jul 29, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@stuggi: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

@openshift-ci
openshift-ci Bot requested review from Akrog and danpawlik July 29, 2026 15:23

@abays abays left a comment

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.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 29, 2026
@stuggi

stuggi commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

@rebtoor @jistr could you please review this? needs approval for adoption and ci-framework

@openshift-ci

openshift-ci Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

@stuggi: 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.

@rebtoor rebtoor left a comment

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.

/approve
/lgtm

@jistr jistr left a comment

Copy link
Copy Markdown

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 commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, jistr, rebtoor, stuggi

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 Jul 30, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit 43b6aab into openshift:main Jul 30, 2026
12 checks passed
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@stuggi: Updated the following 2 configmaps:

  • config configmap in namespace ci at cluster app.ci using the following files:
    • key core-services-prow-02_config-openstack-k8s-operators-ci-framework-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/ci-framework/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-data-plane-adoption-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/data-plane-adoption/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-edpm-ansible-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/edpm-ansible/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-openstack-must-gather-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/openstack-must-gather/_prowconfig.yaml
  • config configmap in namespace ci at cluster core-ci using the following files:
    • key core-services-prow-02_config-openstack-k8s-operators-ci-framework-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/ci-framework/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-data-plane-adoption-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/data-plane-adoption/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-edpm-ansible-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/edpm-ansible/_prowconfig.yaml
    • key core-services-prow-02_config-openstack-k8s-operators-openstack-must-gather-_prowconfig.yaml using file core-services/prow/02_config/openstack-k8s-operators/openstack-must-gather/_prowconfig.yaml
Details

In response to this:

In order to save CI resources it has been decided to not run zuul jobs in 18-stable branch, only in master and 18.0-frX ones. We need to disable the branch protection for that to allow to merge changes.

This was done in 31831ab for watcher, this commit changes it for the other repos where branch protection is enabled.

Summary by CodeRabbit

  • Disables branch protection for the 18-stable branch in four ospk8s repositories:
  • ci-framework
  • data-plane-adoption
  • edpm-ansible
  • openstack-must-gather
  • Allows changes to merge without required Zuul jobs on these branches, conserving CI resources while keeping CI focused on master and 18.0-frX.

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.

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.

4 participants