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

🌱 Use absolute paths for folder and resourcePool #3035

Merged
merged 1 commit into from
Jun 6, 2024
Merged

🌱 Use absolute paths for folder and resourcePool #3035

merged 1 commit into from
Jun 6, 2024

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
We should not assume that folder and resourcePool names are unique within our test vCenter
(with Boskos we will use absolute paths anyway)

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 #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 6, 2024
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

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

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
  • pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-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.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

@sbueringer
Copy link
Member Author

/assign @fabriziopandini @chrischdi

@sbueringer sbueringer mentioned this pull request Jun 6, 2024
Merged
chrischdi
chrischdi reviewed Jun 6, 2024
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: af04681fee879e2e50dde22492cfa5034e5dc948

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Jun 6, 2024
@k8s-ci-robot k8s-ci-robot merged commit 1fbe433 into kubernetes-sigs:main Jun 6, 2024
26 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jun 6, 2024
@sbueringer
Copy link
Member Author

/cherry-pick release-0.17

@sbueringer
Copy link
Member Author

/cherry-pick release-0.18

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: cannot checkout release-0.17: error checking out "release-0.17": exit status 1 error: pathspec 'release-0.17' did not match any file(s) known to git

In response to this:

/cherry-pick release-0.17

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-infra-cherrypick-robot
Copy link

@sbueringer: cannot checkout release-0.18: error checking out "release-0.18": exit status 1 error: pathspec 'release-0.18' did not match any file(s) known to git

In response to this:

/cherry-pick release-0.18

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.

@sbueringer
Copy link
Member Author

/cherry-pick release-1.10

@sbueringer
Copy link
Member Author

/cherry-pick release-1.9

@sbueringer
Copy link
Member Author

/cherry-pick release-1.8

@sbueringer
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #3036

In response to this:

/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-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 6, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #3035 failed to apply on top of branch "release-1.9":

Applying: Use absolute paths for folder and resourcePool
Using index info to reconstruct a base tree...
A	test/e2e/config/vsphere.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/config/vsphere.yaml deleted in HEAD and modified in Use absolute paths for folder and resourcePool. Version Use absolute paths for folder and resourcePool of test/e2e/config/vsphere.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use absolute paths for folder and resourcePool
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.9

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-infra-cherrypick-robot
Copy link

@sbueringer: #3035 failed to apply on top of branch "release-1.8":

Applying: Use absolute paths for folder and resourcePool
Using index info to reconstruct a base tree...
A	test/e2e/config/vsphere.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/config/vsphere.yaml deleted in HEAD and modified in Use absolute paths for folder and resourcePool. Version Use absolute paths for folder and resourcePool of test/e2e/config/vsphere.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use absolute paths for folder and resourcePool
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.8

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-infra-cherrypick-robot
Copy link

@sbueringer: #3035 failed to apply on top of branch "release-1.7":

Applying: Use absolute paths for folder and resourcePool
Using index info to reconstruct a base tree...
A	test/e2e/config/vsphere.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/config/vsphere.yaml deleted in HEAD and modified in Use absolute paths for folder and resourcePool. Version Use absolute paths for folder and resourcePool of test/e2e/config/vsphere.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use absolute paths for folder and resourcePool
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-sigs/prow repository.

@sbueringer sbueringer deleted the pr-absolute-paths branch June 6, 2024 12:37
This was referenced Jun 6, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrischdi chrischdi chrischdi left review comments

@rvanderp3 rvanderp3 Awaiting requested review from rvanderp3

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.
5 participants
@sbueringer @k8s-ci-robot @k8s-infra-cherrypick-robot @chrischdi @fabriziopandini