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

Fix failing imageio test #2148

Merged
merged 2 commits into from Feb 10, 2022
Merged

Fix failing imageio test #2148

merged 2 commits into from Feb 10, 2022

Conversation

awels
Copy link
Member

@awels awels commented Feb 9, 2022 •
edited

Signed-off-by: Alexander Wels awels@redhat.com

What this PR does / why we need it:
Always enable scratch space for imageio imports. Before imageio was doing the create pod without scratch space, then detect we need it, delete pod, and start new pod with scratch space cycle for every delta in a warm migration. This PR just takes out the cycle and immediately requires scratch space.

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 #

Special notes for your reviewer:

Release note:

NONE

@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Feb 9, 2022
@brybacki brybacki mentioned this pull request Feb 10, 2022
Closed
@awels
Fix failing imageio test
3bc9eb0 
Always enable scratch space for imageio imports.

Signed-off-by: Alexander Wels <awels@redhat.com>
@arnongilboa
Copy link
Collaborator

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 10, 2022
@awels
Copy link
Member Author

awels commented Feb 10, 2022

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

@kubevirt-bot
Copy link
Contributor

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

In response to this:

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

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.

@awels
Only always enable scratch space with warm migration imports.
b144cf9 
Signed-off-by: Alexander Wels <awels@redhat.com>
@kubevirt-bot kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 10, 2022
@arnongilboa
Copy link
Collaborator

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 10, 2022
@awels
Copy link
Member Author

awels commented Feb 10, 2022

/approve

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awels

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 10, 2022
@awels
Copy link
Member Author

awels commented Feb 10, 2022

/override pull-containerized-data-importer-e2e-k8s-1.22-hpp-istio
/override pull-containerized-data-importer-e2e-k8s-1.21-hpp

@kubevirt-bot
Copy link
Contributor

@awels: Overrode contexts on behalf of awels: pull-containerized-data-importer-e2e-k8s-1.21-hpp, pull-containerized-data-importer-e2e-k8s-1.22-hpp-istio

In response to this:

/override pull-containerized-data-importer-e2e-k8s-1.22-hpp-istio
/override pull-containerized-data-importer-e2e-k8s-1.21-hpp

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.

@kubevirt-bot kubevirt-bot merged commit 907015e into kubevirt:main Feb 10, 2022
@kubevirt-bot
Copy link
Contributor

@awels: #2148 failed to apply on top of branch "release-v1.34":

Applying: Fix failing imageio test
Using index info to reconstruct a base tree...
M	pkg/controller/import-controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/import-controller.go
CONFLICT (content): Merge conflict in pkg/controller/import-controller.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 Fix failing imageio test
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:

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

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.

@kubevirt-bot
Copy link
Contributor

@awels: new pull request created: #2151

In response to this:

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

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.

This was referenced Feb 10, 2022
Merged
Merged
@kubevirt-bot
Copy link
Contributor

@awels: new pull request created: #2152

In response to this:

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

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.

@kubevirt-bot
Copy link
Contributor

@awels: #2148 failed to apply on top of branch "release-v1.38":

Applying: Fix failing imageio test
Using index info to reconstruct a base tree...
M	pkg/controller/import-controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/import-controller.go
CONFLICT (content): Merge conflict in pkg/controller/import-controller.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 Fix failing imageio test
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:

/cherrypick release-v1.44
/cherrypick release-v1.43
/cherrypick release-v1.38
/cherrypick release-v1.34

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.

awels added a commit to awels/containerized-data-importer that referenced this pull request Feb 10, 2022
@awels
Fix failing imageio test (kubevirt#2148)
57bc881 
* Fix failing imageio test

Always enable scratch space for imageio imports.

Signed-off-by: Alexander Wels <awels@redhat.com>

* Only always enable scratch space with warm migration imports.

Signed-off-by: Alexander Wels <awels@redhat.com>
awels added a commit to awels/containerized-data-importer that referenced this pull request Feb 10, 2022
@awels
Fix failing imageio test (kubevirt#2148)
1f413b3 
* Fix failing imageio test

Always enable scratch space for imageio imports.

Signed-off-by: Alexander Wels <awels@redhat.com>

* Only always enable scratch space with warm migration imports.

Signed-off-by: Alexander Wels <awels@redhat.com>
@awels awels mentioned this pull request Feb 10, 2022
Merged
kubevirt-bot pushed a commit that referenced this pull request Feb 14, 2022
@awels
Fix failing imageio test (#2148) (#2153)
aab2440 
* Fix failing imageio test

Always enable scratch space for imageio imports.

Signed-off-by: Alexander Wels <awels@redhat.com>

* Only always enable scratch space with warm migration imports.

Signed-off-by: Alexander Wels <awels@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Feb 14, 2022
@awels
Fix failing imageio test (#2148) (#2154)
a9f3db6 
* Fix failing imageio test

Always enable scratch space for imageio imports.

Signed-off-by: Alexander Wels <awels@redhat.com>

* Only always enable scratch space with warm migration imports.

Signed-off-by: Alexander Wels <awels@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brybacki brybacki brybacki left review comments

@arnongilboa arnongilboa arnongilboa left review comments

@ShellyKa13 ShellyKa13 ShellyKa13 left review comments

@aglitke aglitke Awaiting requested review from aglitke

@mhenriks mhenriks Awaiting requested review from mhenriks

Assignees

@arnongilboa arnongilboa

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@awels @arnongilboa @kubevirt-bot @aglitke @brybacki @ShellyKa13