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

Test suite enhancements around WMCO deployments #1620

Merged
merged 2 commits into from May 20, 2023
Merged

Test suite enhancements around WMCO deployments #1620

merged 2 commits into from May 20, 2023

Conversation

sebsoto
Copy link
Contributor

@sebsoto sebsoto commented May 17, 2023

This is a set of changes which are meant to enable better upgrade testing in CI

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 17, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 17, 2023 •
edited by openshift-ci bot

@sebsoto: This pull request references WINC-950 which is a valid jira issue.

In response to this:

This is a set of changes which are meant to enable better upgrade testing in CI

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 the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 17, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 17, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2023
@sebsoto
[hack] Only deploy operator if it doesn't exist
ce1602a 
Makes the e2e hack script smarter and only deploys the operator if it
is not already deployed.
@sebsoto sebsoto force-pushed the upgradeChanges branch 2 times, most recently from 6e3ccbe to b48a63e Compare May 17, 2023 18:15
@sebsoto
Copy link
Contributor Author

sebsoto commented May 17, 2023

/approve cancel

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2023
@sebsoto
Copy link
Contributor Author

sebsoto commented May 17, 2023

/test gcp-e2e-operator

@sebsoto
Copy link
Contributor Author

sebsoto commented May 17, 2023

/test aws-e2e-operator

@sebsoto
Copy link
Contributor Author

sebsoto commented May 17, 2023

/test aws-e2e-upgrade

@sebsoto sebsoto changed the title WINC-950: Test suite enhancements around WMCO deployments Test suite enhancements around WMCO deployments May 17, 2023
@openshift-ci-robot openshift-ci-robot removed the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 17, 2023
@openshift-ci-robot
Copy link

@sebsoto: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

This is a set of changes which are meant to enable better upgrade testing in CI

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.

aravindhp
aravindhp approved these changes May 17, 2023
View reviewed changes
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for doing this, @sebsoto. No more disabling the version test when running locally ❤️

test/e2e/validation_test.go
@@ -41,6 +42,9 @@ const (
wmcoContainerName = "manager"
)

// versionRegex captures the version from the output of the WMCO version command
var versionRegex = regexp.MustCompile(`version: "([^"]*)"`)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add an example to show what you are matching for

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp

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 May 17, 2023
@sebsoto
[test] Get WMCO version from the running operator
858e3e9 
Changes the way the tests determine the expected WMCO version. Instead
of building the operator locally, and running the version command, the
tests will exec into the running WMCO pod and run the version command
there. This allows for the tests to run against an operator without
having direct access to the source that built the operator.

The main importance of this is the tests can now be run against a WMCO
which has been installed from a bundle not built by the user. This
includes officially released WMCO bundles installed via OperatorHub.

This will also enable better upgrade testing, as we will be able to
install an operator on the cluster built from a different pipeline and
run tests against it. Such as installing a 4.13 operator on a 4.14
cluster, running some tests against it, and then upgrading to the 4.14
operator.
saifshaikh48
saifshaikh48 reviewed May 18, 2023
View reviewed changes
Copy link
Contributor

@saifshaikh48 saifshaikh48 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2023
@sebsoto sebsoto marked this pull request as ready for review May 18, 2023 15:59
@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 May 18, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0ecb2e1 and 2 for PR HEAD 858e3e9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 089f77e and 1 for PR HEAD 858e3e9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD f0a7348 and 0 for PR HEAD 858e3e9 in total

@openshift-ci-robot
Copy link

/hold

Revision 858e3e9 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2023
@sebsoto
Copy link
Contributor Author

sebsoto commented May 19, 2023

/test aws-e2e-upgrade

Some issues installing the operator, investigating.

@sebsoto
Copy link
Contributor Author

sebsoto commented May 19, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2023
@aravindhp
Copy link
Contributor

/hold
until kube 1.27 rebase #1601 lands

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2023
@aravindhp
Copy link
Contributor

/hold cancel
/retest-required

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 949ecb3 and 2 for PR HEAD 858e3e9 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2023

@sebsoto: 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 b2d485d into openshift:master May 20, 2023
16 checks passed
@sebsoto
Copy link
Contributor Author

sebsoto commented May 22, 2023

/cherry-pick release-4.13

@sebsoto
Copy link
Contributor Author

sebsoto commented May 22, 2023

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link

@sebsoto: #1620 failed to apply on top of branch "release-4.13":

Applying: Only deploy operator if it doesn't exist
Applying: Get WMCO version from the running operator
Using index info to reconstruct a base tree...
M	hack/run-ci-e2e-test.sh
M	test/e2e/main_test.go
M	test/e2e/validation_test.go
M	test/e2e/wmco_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/wmco_test.go
CONFLICT (content): Merge conflict in test/e2e/wmco_test.go
Auto-merging test/e2e/validation_test.go
Auto-merging test/e2e/main_test.go
Auto-merging hack/run-ci-e2e-test.sh
CONFLICT (content): Merge conflict in hack/run-ci-e2e-test.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Get WMCO version from the running operator
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.13

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

@sebsoto: #1620 failed to apply on top of branch "release-4.12":

Applying: Only deploy operator if it doesn't exist
Applying: Get WMCO version from the running operator
Using index info to reconstruct a base tree...
M	hack/run-ci-e2e-test.sh
M	test/e2e/main_test.go
M	test/e2e/validation_test.go
M	test/e2e/wmco_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/wmco_test.go
CONFLICT (content): Merge conflict in test/e2e/wmco_test.go
Auto-merging test/e2e/validation_test.go
Auto-merging test/e2e/main_test.go
Auto-merging hack/run-ci-e2e-test.sh
CONFLICT (content): Merge conflict in hack/run-ci-e2e-test.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Get WMCO version from the running operator
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.12

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.

@mtnbikenc
Copy link
Member

/cherry-pick release-4.13

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 14, 2023
Merged
@openshift-cherrypick-robot
Copy link

@mtnbikenc: new pull request created: #1727

In response to this:

/cherry-pick release-4.13

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

/cherry-pick release-4.12

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 20, 2023
Merged
@openshift-cherrypick-robot
Copy link

@mansikulkarni96: new pull request created: #1819

In response to this:

/cherry-pick release-4.12

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saifshaikh48 saifshaikh48 saifshaikh48 left review comments

@aravindhp aravindhp Awaiting requested review from aravindhp

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

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
8 participants
@sebsoto @openshift-ci-robot @aravindhp @openshift-cherrypick-robot @mtnbikenc @mansikulkarni96 @saifshaikh48 @openshift-merge-robot