🌱 Add custom upgrade option to e2e

[mboukhalfa]

What this PR does / why we need it:
Add custom upgrade option to UpgradeManagementClusterAndWait
Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # 7311

[k8s-ci-robot]

Hi @mboukhalfa. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[sbueringer]

/ok-to-test
/test pull-cluster-api-e2e-full-main

[sbueringer]

Thx!

/lgtm
/assign @fabriziopandini

/cherry-pick release-1.2
(to facilitate adoption)

[k8s-infra-cherrypick-robot]

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

In response to this:

Thx!

/lgtm
/assign @fabriziopandini

/cherry-pick release-1.2
(to facilitate adoption)

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.

[mboukhalfa]

/hold
We might want to add this option to ClusterctlUpgradeSpecInput as well

[mboukhalfa]

@sbueringer @fabriziopandini I added a test commit to verify that these changes can help with custom upgrade to a pre-release can we run full e2e on that?
if passed I will remove the test commit and unhold the PR

[sbueringer]

Sure! good idea

/test pull-cluster-api-e2e-full-main

[mboukhalfa]

Hmm 0.4 to custom upgrade v1.2.2 and v1.2.0-rc0 passed but not sure why 0.3 to current timed out ?

[mboukhalfa]

/test pull-cluster-api-e2e-full-main

[mboukhalfa]

/test pull-cluster-api-e2e-full-main

[mboukhalfa]

/unhold
full e2e passed with the test commit
test commit removed and PR ready to go in

[sbueringer]

Last one from my side

Once we basically have lgtm from me and Fabrizio.

Do you want to do another test with setting providers and ensuring it still works after the changes?

[mboukhalfa]

Do you want to do another test with setting providers and ensuring it still works after the changes?

Added a test commit I will run full e2e

[mboukhalfa]

/test pull-cluster-api-e2e-full-main

[mboukhalfa]

as the full e2e passed I will remove the test commit then the PR will ready to go in

[sbueringer]

Thank you!

/lgtm
/assign @fabriziopandini

[fabriziopandini]

Great work!
/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 [fabriziopandini]

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

[k8s-infra-cherrypick-robot]

@sbueringer: #7341 failed to apply on top of branch "release-1.2":

Applying: Add custom upgrade option to e2e
Using index info to reconstruct a base tree...
M	test/e2e/clusterctl_upgrade.go
M	test/framework/clusterctl/client.go
M	test/framework/clusterctl/clusterctl_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/clusterctl/clusterctl_helpers.go
CONFLICT (content): Merge conflict in test/framework/clusterctl/clusterctl_helpers.go
Auto-merging test/framework/clusterctl/client.go
CONFLICT (content): Merge conflict in test/framework/clusterctl/client.go
Auto-merging test/e2e/clusterctl_upgrade.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add custom upgrade option to e2e
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:

Thx!

/lgtm
/assign @fabriziopandini

/cherry-pick release-1.2
(to facilitate adoption)

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.