Skip to content

NO-ISSUE: fix ginkgo name typo#5686

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
agullon:fix_ginkgo_typo
Nov 4, 2025
Merged

NO-ISSUE: fix ginkgo name typo#5686
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
agullon:fix_ginkgo_typo

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Nov 3, 2025

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 3, 2025
@openshift-ci-robot
Copy link

@agullon: This pull request explicitly references no jira issue.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from eslutsky and jogeo November 3, 2025 14:08
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2025
@agullon
Copy link
Contributor Author

agullon commented Nov 3, 2025

/retest

@kasturinarra
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, kasturinarra

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:
  • OWNERS [agullon,kasturinarra]

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

@ggiguash
Copy link
Contributor

ggiguash commented Nov 4, 2025

/override ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

@ggiguash
Copy link
Contributor

ggiguash commented Nov 4, 2025

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 4, 2025
@openshift-ci-robot
Copy link

@ggiguash: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 4, 2025

@ggiguash: Overrode contexts on behalf of ggiguash: ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

/override ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 4, 2025

@agullon: 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 cce8a4f into openshift:main Nov 4, 2025
17 checks passed
@agullon
Copy link
Contributor Author

agullon commented Nov 4, 2025

/cherrypick release-4.20

@openshift-cherrypick-robot

@agullon: #5686 failed to apply on top of branch "release-4.20":

Applying: fix ginkgo typo
Using index info to reconstruct a base tree...
M	test/bin/scenario.sh
A	test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh
A	test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh deleted in HEAD and modified in fix ginkgo typo. Version fix ginkgo typo of test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh left in tree.
CONFLICT (modify/delete): test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh deleted in HEAD and modified in fix ginkgo typo. Version fix ginkgo typo of test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh left in tree.
Auto-merging test/bin/scenario.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix ginkgo typo

Details

In response to this:

/cherrypick release-4.20

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants