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

[release-4.10] WINC-818: [test] Fix upgradeable condition test #1339

Merged
merged 2 commits into from
Nov 30, 2022
Merged

[release-4.10] WINC-818: [test] Fix upgradeable condition test #1339

merged 2 commits into from
Nov 30, 2022

Conversation

saifshaikh48
Copy link
Contributor

This is a manual cherry-pick of #1318
Updated vendor commit for conflicts.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 28, 2022 •
edited

@saifshaikh48: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.10] WINC-818: [test] Fix upgradeable condition 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/test-infra repository.

@mansikulkarni96
Copy link
Member

Thanks for opening this @saifshaikh48
/lgtm

@saifshaikh48
Copy link
Contributor Author

/cherry-pick release-4.9

The 4.9 cherry-pick needs #1340 to merge first (missing backport causing merge conflicts).

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.9

The 4.9 cherry-pick needs #1340 to merge first (missing backport causing merge conflicts).

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.

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Nov 28, 2022
@saifshaikh48 saifshaikh48 marked this pull request as draft November 28, 2022 18:25
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 28, 2022
mansikulkarni96 and others added 2 commits November 28, 2022 13:26
@mansikulkarni96 @saifshaikh48
[test] Fix upgradeable condition test
d64297a 
This commit fixes an issue where the upgradeable condition was
not being tested in the e2e test suite. This was the case
because the OPERATOR_CONDITION_NAME env var is not being set in
the CI env when using the OLM upgrade workflow. The recommendation
to fix this was to instead get it from the deployment spec as the
condition is present once the operator is deployed. The cache
client had to be replaced with the OLM client to get the operator
condition using current context.

(cherry picked from commit 0ffe33d)
(cherry picked from commit cee94c5)
@saifshaikh48
[vendor] Vendor dependencies for OLM clientset
242eb13 
go get github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned
go mod tidy -go=1.16 && go mod tidy -go=1.17 && go mod vendor
@saifshaikh48
Copy link
Contributor Author

/test lint

@saifshaikh48 saifshaikh48 marked this pull request as ready for review November 28, 2022 19:01
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 28, 2022
@alinaryan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saifshaikh48, sebsoto

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 30, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD fab5b35 and 2 for PR HEAD 242eb13 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 30, 2022

@saifshaikh48: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 34b35ab into openshift:release-4.10 Nov 30, 2022
@openshift-cherrypick-robot
Copy link

@saifshaikh48: #1339 failed to apply on top of branch "release-4.9":

Applying: Fix upgradeable condition test
Using index info to reconstruct a base tree...
M	test/e2e/clusterinfo/openshift.go
M	test/e2e/validation_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/validation_test.go
CONFLICT (content): Merge conflict in test/e2e/validation_test.go
Auto-merging test/e2e/clusterinfo/openshift.go
CONFLICT (content): Merge conflict in test/e2e/clusterinfo/openshift.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 upgradeable condition 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:

/cherry-pick release-4.9

The 4.9 cherry-pick needs #1340 to merge first (missing backport causing merge conflicts).

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.

@saifshaikh48 saifshaikh48 mentioned this pull request Nov 30, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebsoto sebsoto sebsoto approved these changes

@aravindhp aravindhp Awaiting requested review from aravindhp

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

Assignees

@mansikulkarni96 mansikulkarni96

@alinaryan alinaryan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@saifshaikh48 @mansikulkarni96 @openshift-cherrypick-robot @alinaryan @openshift-ci-robot @sebsoto @openshift-merge-robot