Skip to content

openshift-dpf Fixes to git rebase - #82899

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
josecastillolema:dpf-rebase
Aug 4, 2026
Merged

openshift-dpf Fixes to git rebase#82899
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
josecastillolema:dpf-rebase

Conversation

@josecastillolema

@josecastillolema josecastillolema commented Aug 4, 2026

Copy link
Copy Markdown
Member

Now that we have several branches in openshift-dpf (main, release-4.22) we need this fix.

Summary by CodeRabbit

This PR updates OpenShift CI scripts for the openshift-dpf repository.

The scripts now fetch OPENSHIFT_DPF_BRANCH before rebase operations and rebase against origin/${OPENSHIFT_DPF_BRANCH}. This supports multiple branches, including main and release-4.22.

The change improves reliability for DPF hypervisor deployment and network test jobs.

Signed-off-by: Jose Castillo Lema <josecastillolema@gmail.com>

    gitleaks.version: 8.30.0
    gitleaks.check-secrets: ENABLED
@coderabbitai

coderabbitai Bot commented Aug 4, 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: d1f66cac-8d6f-4022-a117-3c31f12f7b37

📥 Commits

Reviewing files that changed from the base of the PR and between cb5fda9 and 703bd8c.

📒 Files selected for processing (1)
  • ci-operator/step-registry/dpf/hypervisor/network-tests/dpf-hypervisor-network-tests-commands.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/step-registry/dpf/hypervisor/network-tests/dpf-hypervisor-network-tests-commands.sh

Walkthrough

The PR updates two DPF job scripts. Their rebase commands now target origin/${OPENSHIFT_DPF_BRANCH} instead of the unqualified branch reference. The network-tests script adds a git fetch command before the rebase.

Changes

DPF branch rebase

Layer / File(s) Summary
Use origin remote for DPF rebases
ci-operator/step-registry/dpf/hypervisor/deploy-cluster/dpf-hypervisor-deploy-cluster-commands.sh, ci-operator/step-registry/dpf/hypervisor/network-tests/dpf-hypervisor-network-tests-commands.sh
Both scripts now rebase against origin/${OPENSHIFT_DPF_BRANCH}. The network-tests script adds a git fetch origin ${OPENSHIFT_DPF_BRANCH} command to fetch the branch before checkout.

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

Possibly related PRs

  • openshift/release#82878: The main PR directly updates the same network-tests script's PR checkout rebase logic and similarly adjusts the deploy-cluster rebase reference.

Suggested reviewers: tsorya, szigmon

🚥 Pre-merge checks | ✅ 8 | ❌ 7

❌ Failed checks (7 inconclusive)

Check name Status Explanation Resolution
Test Structure And Quality ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Microshift Test Compatibility ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Single Node Openshift (Sno) Test Compatibility ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ote Binary Stdout Contract ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Weak-Crypto ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Container-Privileges ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Sensitive-Data-In-Logs ❓ Inconclusive Custom check execution failed before a final verdict was produced. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
✅ Passed checks (8 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main change: fixing git rebase handling by adding fetch operations before rebases in openshift-dpf scripts.
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 This PR modifies only shell scripts (.sh files) for CI/CD orchestration. It contains no Ginkgo test files or test name definitions. The custom check for Ginkgo test name stability is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed The PR modifies CI/test shell scripts that perform git operations. These changes do not introduce deployment manifests, operator code, controllers, or any Kubernetes scheduling constraints.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR adds no Ginkgo tests. It only changes shell git fetch/rebase commands, so this IPv6 and disconnected-network check is not applicable.
✨ 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-ci
openshift-ci Bot requested review from szigmon and tsorya August 4, 2026 15:00
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2026

@coderabbitai coderabbitai Bot left a comment

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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@ci-operator/step-registry/dpf/hypervisor/network-tests/dpf-hypervisor-network-tests-commands.sh`:
- Line 60: Update the git command sequence before the rebase to explicitly fetch
the current ${OPENSHIFT_DPF_BRANCH} from origin, then retain the existing rebase
against origin/${OPENSHIFT_DPF_BRANCH}. Ensure the base-branch ref is refreshed
even when reusing a checkout from a previous deployment.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro Plus

Run ID: 06eaa131-6ec0-41c8-84c9-a84c466e3bae

📥 Commits

Reviewing files that changed from the base of the PR and between b829355 and cb5fda9.

📒 Files selected for processing (2)
  • ci-operator/step-registry/dpf/hypervisor/deploy-cluster/dpf-hypervisor-deploy-cluster-commands.sh
  • ci-operator/step-registry/dpf/hypervisor/network-tests/dpf-hypervisor-network-tests-commands.sh

Signed-off-by: Jose Castillo Lema <josecastillolema@gmail.com>

    gitleaks.version: 8.30.0
    gitleaks.check-secrets: ENABLED
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@josecastillolema: 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-rh-ecosystem-edge-openshift-dpf-main-deploy-cluster rh-ecosystem-edge/openshift-dpf presubmit Registry content changed
pull-ci-rh-ecosystem-edge-openshift-dpf-release-4.22-deploy-cluster rh-ecosystem-edge/openshift-dpf presubmit Registry content changed
pull-ci-rh-ecosystem-edge-openshift-dpf-main-network-tests rh-ecosystem-edge/openshift-dpf presubmit Registry content changed
pull-ci-rh-ecosystem-edge-openshift-dpf-release-4.22-network-tests rh-ecosystem-edge/openshift-dpf presubmit Registry content changed
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.

@josecastillolema

Copy link
Copy Markdown
Member Author

/assign @wabouhamad

@josecastillolema

Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@josecastillolema: 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 Aug 4, 2026

@wabouhamad wabouhamad left a comment

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.

/lgtm

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

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: josecastillolema, wabouhamad

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 commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit 235671a into openshift:main Aug 4, 2026
10 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.

2 participants