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.

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

e2e: must-gather: fix the setup process #1120

Merged
merged 2 commits into from
Dec 17, 2024
Merged

e2e: must-gather: fix the setup process #1120

merged 2 commits into from
Dec 17, 2024

Conversation

ffromani
Copy link
Member

In case we are skipping the setup, make sure to fetch the existing scheduler data, failing loudly if that resource is not actually present.

Along the way, cleanup the deploy API and package to make sure context and timeout are properly passed down the call chain.

make sure we always have a scheduler object reference if
both we setup it explicitly or if we skip the setup and
just check what the cluster have.

Signed-off-by: Francesco Romani <[email protected]>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2024
@ffromani
Copy link
Member Author

carrying forward #1115 because holidays

@ffromani
Copy link
Member Author

/cc @Tal-or

@openshift-ci openshift-ci bot requested a review from Tal-or December 16, 2024 10:14
test/utils/deploy/deploy.go Outdated Show resolved Hide resolved
test/utils/deploy/deploy.go Outdated Show resolved Hide resolved
test/utils/deploy/deploy.go Outdated Show resolved Hide resolved
make sure the context and timeouts are properly
passed down and honored.

Signed-off-by: Francesco Romani <[email protected]>
@ffromani ffromani force-pushed the e2e-mg-deployer-fix branch from 0f88378 to 82b4e49 Compare December 16, 2024 12:56
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2024
Copy link
Contributor

openshift-ci bot commented Dec 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani, Tal-or

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

@ffromani ffromani merged commit 258cd25 into main Dec 17, 2024
15 checks passed
@ffromani ffromani deleted the e2e-mg-deployer-fix branch December 17, 2024 07:39
@ffromani ffromani added the cherry-pick-candidate Possible cherry-pick in the future label Dec 17, 2024
@ffromani
Copy link
Member Author

/cherry-pick release-4.18

@openshift-cherrypick-robot

@ffromani: #1120 failed to apply on top of branch "release-4.18":

Applying: e2e: must-gather: get nro scheduler ref when skipping setup
Applying: e2e: utils: cleanup deploy pkg API
Using index info to reconstruct a base tree...
M	test/e2e/must-gather/must_gather_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/must-gather/must_gather_suite_test.go
CONFLICT (content): Merge conflict in test/e2e/must-gather/must_gather_suite_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 0002 e2e: utils: cleanup deploy pkg API

In response to this:

/cherry-pick release-4.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.

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. cherry-pick-candidate Possible cherry-pick in the future lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants