search

kubernetes-sigs / cluster-api

Home for Cluster API, a subproject of sig-cluster-lifecycle
https://cluster-api.sigs.k8s.io
Apache License 2.0
3.41k stars 1.26k forks source link

🌱 test: check for metadata.yaml when resolving releases to not try to use unreleased versions #10618

Closed chrischdi closed 2 weeks ago

chrischdi commented 2 weeks ago

What this PR does / why we need it:

Similar to what clusterctl does since this PR got implemented: https://github.com/kubernetes-sigs/cluster-api/pull/10220

We now do it similar to that in e2e tests where it failed before.

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 #10450

/area e2e-testing

chrischdi commented 2 weeks ago

/test help

k8s-ci-robot commented 2 weeks ago

@chrischdi: The specified target(s) for /test were not found. The following commands are available to trigger required jobs:

The following commands are available to trigger optional jobs:

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

In response to [this](https://github.com/kubernetes-sigs/cluster-api/pull/10618#issuecomment-2112213331): >/test help 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-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
chrischdi commented 2 weeks ago

/test pull-cluster-api-e2e-main

chrischdi commented 2 weeks ago

/cherry-pick release-1.7

k8s-infra-cherrypick-robot commented 2 weeks ago

@chrischdi: 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/kubernetes-sigs/cluster-api/pull/10618#issuecomment-2112214108): >/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-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
chrischdi commented 2 weeks ago

cc @adilGhaffarDev

sbueringer commented 2 weeks ago

/approve

/assign @fabriziopandini

k8s-ci-robot commented 2 weeks ago

LGTM label has been added.

Git tree hash: 4ebf4fef0e50139d5e8ad19906e83279e1176bb6

k8s-ci-robot commented 2 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, sbueringer

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/kubernetes-sigs/cluster-api/blob/main/OWNERS)~~ [fabriziopandini,sbueringer] 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 commented 2 weeks ago

@chrischdi: new pull request created: #10645

In response to [this](https://github.com/kubernetes-sigs/cluster-api/pull/10618#issuecomment-2112214108): >/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-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
chrischdi commented 2 weeks ago

/cherry-pick release-1.6

k8s-infra-cherrypick-robot commented 2 weeks ago

@chrischdi: #10618 failed to apply on top of branch "release-1.6":

Applying: test: check for metadata.yaml when resolving releases to not try to use unreleased versions
Using index info to reconstruct a base tree...
M   cmd/clusterctl/client/repository/repository_github.go
M   test/framework/clusterctl/e2e_config.go
M   test/framework/clusterctl/e2e_config_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/clusterctl/e2e_config_test.go
CONFLICT (content): Merge conflict in test/framework/clusterctl/e2e_config_test.go
Auto-merging test/framework/clusterctl/e2e_config.go
CONFLICT (content): Merge conflict in test/framework/clusterctl/e2e_config.go
Auto-merging cmd/clusterctl/client/repository/repository_github.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 test: check for metadata.yaml when resolving releases to not try to use unreleased versions
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/kubernetes-sigs/cluster-api/pull/10618#issuecomment-2119271857): >/cherry-pick release-1.6 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-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.