search

metal3-io / cluster-api-provider-metal3

Metal³ integration with https://github.com/kubernetes-sigs/cluster-api
Apache License 2.0
194 stars 87 forks source link

🌱 Bump BMO and minor fix in e2e config #1768

Closed adilGhaffarDev closed 2 weeks ago

adilGhaffarDev commented 2 weeks ago

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

adilGhaffarDev commented 2 weeks ago

/cherry-pick release-1.7

metal3-io-bot commented 2 weeks ago

@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](https://github.com/metal3-io/cluster-api-provider-metal3/pull/1768#issuecomment-2172928057): >/cherry-pick release-1.7 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
adilGhaffarDev commented 2 weeks ago

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

metal3-io-bot commented 2 weeks ago

[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: - ~~[OWNERS](https://github.com/metal3-io/cluster-api-provider-metal3/blob/main/OWNERS)~~ [Sunnatillo] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
adilGhaffarDev commented 2 weeks ago

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

done

adilGhaffarDev commented 2 weeks ago

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

adilGhaffarDev commented 2 weeks ago

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

adilGhaffarDev commented 2 weeks ago

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

metal3-io-bot commented 2 weeks ago

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

In response to [this](https://github.com/metal3-io/cluster-api-provider-metal3/pull/1768#issuecomment-2175580055): >/override metal3-centos-e2e-integration-test-main Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
metal3-io-bot commented 2 weeks ago

@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](https://github.com/metal3-io/cluster-api-provider-metal3/pull/1768#issuecomment-2172928057): >/cherry-pick release-1.7 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.