Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Bump BMO and minor fix in e2e config #1768

Merged
merged 1 commit into from
Jun 18, 2024
Merged

🌱 Bump BMO and minor fix in e2e config #1768

merged 1 commit into from
Jun 18, 2024

Conversation

adilGhaffarDev
Copy link
Member

What this PR does / why we need it:
Bumping BMO and minor fix in e2e config

@metal3-io-bot metal3-io-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 17, 2024
@adilGhaffarDev
Copy link
Member Author

/cherry-pick release-1.7

@metal3-io-bot
Copy link
Contributor

@adilGhaffarDev: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

@adilGhaffarDev
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main

kashifest
kashifest reviewed Jun 17, 2024
View reviewed changes
Copy link
Member

@kashifest kashifest left a comment

Choose a reason for hiding this comment

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

you have to also bump github.com/metal3-io/baremetal-operator/pkg/hardwareutils in a couple of the go mods

Sunnatillo
Sunnatillo reviewed Jun 17, 2024
View reviewed changes
Copy link
Member

@Sunnatillo Sunnatillo left a comment

Choose a reason for hiding this comment

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

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Sunnatillo

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

The pull request process is described here

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2024
@adilGhaffarDev
Copy link
Member Author

you have to also bump github.com/metal3-io/baremetal-operator/pkg/hardwareutils in a couple of the go mods

done

@adilGhaffarDev
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main

@adilGhaffarDev
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

kashifest
kashifest reviewed Jun 17, 2024
View reviewed changes
Copy link
Member

@kashifest kashifest left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 17, 2024
@adilGhaffarDev
Copy link
Member Author

/override metal3-centos-e2e-integration-test-main

@metal3-io-bot
Copy link
Contributor

@adilGhaffarDev: Overrode contexts on behalf of adilGhaffarDev: metal3-centos-e2e-integration-test-main

In response to this:

/override metal3-centos-e2e-integration-test-main

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/test-infra repository.

@metal3-io-bot metal3-io-bot merged commit 801f337 into metal3-io:main Jun 18, 2024
16 checks passed
@metal3-io-bot metal3-io-bot deleted the bump-bmo-0.6.1/adil branch June 18, 2024 09:02
@metal3-io-bot
Copy link
Contributor

@adilGhaffarDev: #1768 failed to apply on top of branch "release-1.7":

Applying: Bumping BMO and minor fix in e2e config
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	test/e2e/config/e2e_conf.yaml
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
Auto-merging test/go.mod
Auto-merging test/e2e/config/e2e_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/config/e2e_conf.yaml
Auto-merging go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bumping BMO and minor fix in e2e config
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

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

@kashifest kashifest kashifest left review comments

@Sunnatillo Sunnatillo Sunnatillo left review comments

@dtantsur dtantsur Awaiting requested review from dtantsur

@smoshiur1237 smoshiur1237 Awaiting requested review from smoshiur1237

Assignees
No one assigned
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@adilGhaffarDev @metal3-io-bot @Sunnatillo @kashifest