Skip to content

Conversation

cprivitere
Copy link
Member

What this PR does / why we need it: Per the 1.10 Release Tasks, we need to:
"Fix clusterctl upgrade tests starting from 1.10 to use GetStableReleaseOfMinor instead of GetLatestReleaseOfMinor"

I believe the correct procedure is to commit this to main and then cherry pick to 1.10, but let me know if that's not the case and I'll resubmit corrected PRs.

/area e2e-testing

- From 1.10 use GetStableReleaseOfMinor instead of GetLatestReleaseOfMinor

Signed-off-by: cprivitere <[email protected]>
@k8s-ci-robot k8s-ci-robot added area/e2e-testing Issues or PRs related to e2e testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 22, 2025
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 22, 2025
@fabriziopandini
Copy link
Member

/test

@k8s-ci-robot
Copy link
Contributor

@fabriziopandini: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-blocking-main
pull-cluster-api-test-main
pull-cluster-api-verify-main

In response to this:

/test

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.

@fabriziopandini
Copy link
Member

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

/lgtm
/approve

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

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

In response to this:

/lgtm
/approve

/cherry-pick release-1.10

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.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e4d0c561d9e279280f9c5064e475c505a26a5a14

@k8s-ci-robot
Copy link
Contributor

[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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 23, 2025
@k8s-ci-robot k8s-ci-robot merged commit 67f2ed9 into kubernetes-sigs:main Apr 23, 2025
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Apr 23, 2025
@k8s-infra-cherrypick-robot

@fabriziopandini: #12118 failed to apply on top of branch "release-1.10":

Applying: fix: clusterctl upgrade tests
Using index info to reconstruct a base tree...
M	test/e2e/clusterctl_upgrade_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/clusterctl_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade_test.go
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: clusterctl upgrade tests

In response to this:

/lgtm
/approve

/cherry-pick release-1.10

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.

@fabriziopandini
Copy link
Member

NOTE: cherry pick is not required, GetLatestReleaseOfMinor was used for v1.10=>current tests, and those tests exists only on main

@mboersma mboersma mentioned this pull request Apr 23, 2025
71 tasks
@cprivitere cprivitere deleted the clusterctl-upgrade-test-use-getstablerelease branch May 7, 2025 18:38
@cprivitere cprivitere restored the clusterctl-upgrade-test-use-getstablerelease branch May 7, 2025 18:38
@cprivitere cprivitere deleted the clusterctl-upgrade-test-use-getstablerelease branch May 12, 2025 17:13
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. area/e2e-testing Issues or PRs related to e2e testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants