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

Enable e2e tests to execute against downstream build #823

Merged
merged 3 commits into from
Oct 17, 2022
Merged

Enable e2e tests to execute against downstream build #823

merged 3 commits into from
Oct 17, 2022

Conversation

hhpatel14
Copy link
Contributor

Cherry-pick: 811 Enable e2e tests to execute against downstream build

weshayutin and others added 2 commits September 14, 2022 15:54
@weshayutin @hhpatel14
Enable e2e tests to execute against downstream build (openshift#811)
7644b49 
* Enable e2e tests to execute against downstream build

Reusing the e2e tests across upstream and downstream builds
will benefit the engineering teams by increasing the coverage
across teams.  Additionally this should enable QE to execute
the dev teams e2e tests against a build.

* New Variable = "stream" ( ok name? )
  * allow cli -stream or env var OADP_STREAM to set value [up,down]
* Only change required was the subscription label

Tested and passed on internal build

* remove var from Entry
@hhpatel14
OADP: cherry-pick:811 enable e2e tests to execute against downstream …
18f1f8f 
…build
@kaovilai
Copy link
Member

63 char :)

@hhpatel14
Copy link
Contributor Author

openshift/release#30796

@hhpatel14
Copy link
Contributor Author

/retest

@hhpatel14
Copy link
Contributor Author

/retest

2 similar comments
@kaovilai
Copy link
Member

/retest

@kaovilai
Copy link
Member

/retest

kaovilai
kaovilai reviewed Sep 22, 2022
View reviewed changes
Makefile
@@ -353,6 +354,7 @@ test-e2e: test-e2e-setup
--ginkgo.label-filter="$(TEST_FILTER)" \
-ci_cred_file=$(CI_CRED_FILE) \
-provider=$(CLUSTER_TYPE) \
-stream=$(OADP_STREAM) \
Copy link
Member

Choose a reason for hiding this comment

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

This was not in #811
Do you want to put this change in master?
https://github.com/openshift/oadp-operator/blob/master/Makefile

@kaovilai
Copy link
Member

/retest

@openshift-ci
Copy link

openshift-ci bot commented Sep 26, 2022

@hhpatel14: 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.

@kaovilai kaovilai requested review from weshayutin and removed request for jwmatthews September 27, 2022 18:59
@kaovilai kaovilai merged commit 918d271 into openshift:oadp-1.0 Oct 17, 2022
@kaovilai
Copy link
Member

/cherry-pick oadp-1.1
/cherry-pick master

@openshift-cherrypick-robot
Copy link
Contributor

@kaovilai: #823 failed to apply on top of branch "oadp-1.1":

Applying: Enable e2e tests to execute against downstream build (#811)
Using index info to reconstruct a base tree...
M	tests/e2e/e2e_suite_test.go
M	tests/e2e/subscription_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/subscription_suite_test.go
Auto-merging tests/e2e/e2e_suite_test.go
Applying: OADP: cherry-pick:811 enable e2e tests to execute against downstream build
Using index info to reconstruct a base tree...
M	Makefile
M	tests/e2e/e2e_suite_test.go
M	tests/e2e/subscription_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/subscription_suite_test.go
Auto-merging tests/e2e/e2e_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/e2e_suite_test.go
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 OADP: cherry-pick:811 enable e2e tests to execute against downstream build
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 oadp-1.1
/cherry-pick master

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.

1 similar comment
@openshift-cherrypick-robot
Copy link
Contributor

@kaovilai: #823 failed to apply on top of branch "oadp-1.1":

Applying: Enable e2e tests to execute against downstream build (#811)
Using index info to reconstruct a base tree...
M	tests/e2e/e2e_suite_test.go
M	tests/e2e/subscription_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/subscription_suite_test.go
Auto-merging tests/e2e/e2e_suite_test.go
Applying: OADP: cherry-pick:811 enable e2e tests to execute against downstream build
Using index info to reconstruct a base tree...
M	Makefile
M	tests/e2e/e2e_suite_test.go
M	tests/e2e/subscription_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/subscription_suite_test.go
Auto-merging tests/e2e/e2e_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/e2e_suite_test.go
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 OADP: cherry-pick:811 enable e2e tests to execute against downstream build
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 oadp-1.1
/cherry-pick master

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
Contributor

@kaovilai: #823 failed to apply on top of branch "master":

Applying: Enable e2e tests to execute against downstream build (#811)
Using index info to reconstruct a base tree...
M	tests/e2e/e2e_suite_test.go
M	tests/e2e/lib/subscription_helpers.go
M	tests/e2e/subscription_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/subscription_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/subscription_suite_test.go
Auto-merging tests/e2e/lib/subscription_helpers.go
CONFLICT (content): Merge conflict in tests/e2e/lib/subscription_helpers.go
Auto-merging tests/e2e/e2e_suite_test.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 Enable e2e tests to execute against downstream build (#811)
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 oadp-1.1
/cherry-pick master

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

@kaovilai kaovilai kaovilai approved these changes

@sseago sseago Awaiting requested review from sseago

@weshayutin weshayutin Awaiting requested review from weshayutin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hhpatel14 @kaovilai @openshift-cherrypick-robot @weshayutin