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.11] WINC-818: [test] Fix upgradeable condition test #1318

Merged
merged 2 commits into from
Nov 9, 2022
Merged

[release-4.11] WINC-818: [test] Fix upgradeable condition test #1318

merged 2 commits into from
Nov 9, 2022

Conversation

mansikulkarni96
Copy link
Member

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 8, 2022 •
edited

@mansikulkarni96: 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.11] 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
[vendor] Vendor dependencies for OLM clientset
47f3d98 
go get github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned
go mod tidy && go mod vendor
@mansikulkarni96
[test] Fix upgradeable condition test
cee94c5 
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)
@mansikulkarni96
Copy link
Member Author

/cherry-pick release-4.10

@openshift-cherrypick-robot
Copy link

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

In response to this:

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

@mansikulkarni96
Copy link
Member Author

/cherry-pick release-4.9

@openshift-cherrypick-robot
Copy link

@mansikulkarni96: 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

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
Copy link
Contributor

openshift-ci bot commented Nov 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, mansikulkarni96

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 8, 2022
@saifshaikh48
Copy link
Contributor

/lgtm

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

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 9, 2022

@mansikulkarni96: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/azure-e2e-ccm-install cee94c5 link false /test azure-e2e-ccm-install

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 3df75e2 into openshift:release-4.11 Nov 9, 2022
@openshift-cherrypick-robot
Copy link

@mansikulkarni96: #1318 failed to apply on top of branch "release-4.10":

Applying: Vendor dependencies for OLM clientset
.git/rebase-apply/patch:2552: trailing whitespace.
The `/v4` version will be backwards compatible with existing `v3.x.y` tags in this repo, as well as 
.git/rebase-apply/patch:2553: trailing whitespace.
`github.com/dgrijalva/jwt-go`. For most users this should be a drop-in replacement, if you're having 
.git/rebase-apply/patch:2706: trailing whitespace.
* Fixed type confusing issue between `string` and `[]string` in `VerifyAudience` ([#12](https://github.com/golang-jwt/jwt/pull/12)). This fixes CVE-2020-26160 
.git/rebase-apply/patch:12400: trailing whitespace.
limited by the interface). 
.git/rebase-apply/patch:12490: trailing whitespace.
environment via benchmarks: 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/github.com/form3tech-oss/jwt-go/MIGRATION_GUIDE.md
Removing vendor/github.com/form3tech-oss/jwt-go/.travis.yml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Vendor dependencies for OLM clientset
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.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/test-infra repository.

@openshift-cherrypick-robot
Copy link

@mansikulkarni96: #1318 failed to apply on top of branch "release-4.9":

Applying: Vendor dependencies for OLM clientset
.git/rebase-apply/patch:2552: trailing whitespace.
The `/v4` version will be backwards compatible with existing `v3.x.y` tags in this repo, as well as 
.git/rebase-apply/patch:2553: trailing whitespace.
`github.com/dgrijalva/jwt-go`. For most users this should be a drop-in replacement, if you're having 
.git/rebase-apply/patch:2706: trailing whitespace.
* Fixed type confusing issue between `string` and `[]string` in `VerifyAudience` ([#12](https://github.com/golang-jwt/jwt/pull/12)). This fixes CVE-2020-26160 
.git/rebase-apply/patch:12400: trailing whitespace.
limited by the interface). 
.git/rebase-apply/patch:12490: trailing whitespace.
environment via benchmarks: 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/github.com/form3tech-oss/jwt-go/MIGRATION_GUIDE.md
Removing vendor/github.com/form3tech-oss/jwt-go/.travis.yml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Vendor dependencies for OLM clientset
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

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 28, 2022
Merged
mansikulkarni96 pushed a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Aug 7, 2023
@cp-paas-bot
Updated US source to: 3df75e2 Merge pull request openshift#1318 from …
06ee443 
…mansikulkarni96/back-WINC811

Updated upstream source commit.
Commit details follow:

Signed-off-by: OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>
Project: https://github.com/openshift/windows-machine-config-operator.git
Branch:  release-4.11
Commit:  3df75e2
Author:  OpenShift Merge Robot
Date:    Wed, 9 Nov 2022 13:51:45 -0500

    Merge pull request openshift#1318 from mansikulkarni96/back-WINC811

    [release-4.11] WINC-818: [test] Fix upgradeable condition test

Additional included commits: 47f3d98, cee94c5

Referenced RedHat JIRA issue: WINC-818

automerge: yes
x-md5: 1b038ee211cf3c8dde6b40dca7bd21ed
Change-Id: Ida105f902e8ee2d1546ae04e7c7a629daa9b528c
mansikulkarni96 pushed a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Aug 7, 2023
Merge branch 'rhaos-4.11-rhel-8__upstream__1b038ee211cf3c8dde6b40dca7…
86ebe73 
…bd21ed' into 'rhaos-4.11-rhel-8'

Updated US source to: 3df75e2 Merge pull request openshift#1318 from mansikulkarni96/back-WINC811

See merge request openshift-winc-midstream/openshift-winc-midstream!57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aravindhp aravindhp aravindhp approved these changes

@sebsoto sebsoto Awaiting requested review from sebsoto

Assignees

@saifshaikh48 saifshaikh48

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
5 participants
@mansikulkarni96 @openshift-cherrypick-robot @saifshaikh48 @aravindhp @openshift-merge-robot