test-e2e/samples/cleanup: centralize code to integrate the project with OLM #4144
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
bd9cfc8
to
2db9fde
Compare
camilamacedo86
changed the title
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
2db9fde
to
f265ec8
Compare
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
f265ec8
to
2843d7c
Compare
| @@ -76,7 +76,9 @@ func (ma *MemcachedAnsible) Run() { | |||
| ma.addingAnsibleTask() | |||
| ma.addingMoleculeMockData() | |||
|
|
|||
| pkg.RunOlmIntegration(ma.ctx) | |||
| log.Infof("integrate the sample with OLM") | |||
| err = ma.ctx.IntegrateProjectWithOLM() | |||
There was a problem hiding this comment.
This looks clean for all the three e2e tests ! :)
estroz
reviewed
Nov 5, 2020
estroz
reviewed
Nov 5, 2020
|
Holding this for discussion (see #4144 (comment)) /hold |
openshift-ci-robot
added
the
do-not-merge/hold
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
0dc1b98
to
9f08121
Compare
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
3 times, most recently
from
56316c1
to
7524fe3
Compare
openshift-ci-robot
added
the
needs-rebase
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
7524fe3
to
33ca1bf
Compare
openshift-ci-robot
removed
the
needs-rebase
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
6 times, most recently
from
e97cf66
to
96e7f65
Compare
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
96e7f65
to
e4987ac
Compare
camilamacedo86
commented
Dec 16, 2020
| @@ -76,7 +76,13 @@ func (ma *MemcachedAnsible) Run() { | |||
| ma.addingAnsibleTask() | |||
| ma.addingMoleculeMockData() | |||
|
|
|||
| ma.ctx.CreateBundle() | |||
There was a problem hiding this comment.
The goal here is to centralize the implementation to allow samples and tests to use the same. Then, the StripBundleAnnotations is only required for the samples.
camilamacedo86
commented
Dec 16, 2020
|
|
||
| err = ctx.StripBundleAnnotations() | ||
| CheckError("stripping bundle annotations", err) | ||
| } |
There was a problem hiding this comment.
note that we are moving it out to the internal/testutils/olm.go where it can be used by both.
camilamacedo86
force-pushed
the
centralize-olm-int-steps
branch
from
e4987ac
to
20b9a65
Compare
estroz
suggested changes
Dec 16, 2020
Comment on lines
33
to
34
| if tc.IsRunningOnKind() { | ||
| By("loading the bundle image into Kind cluster") |
There was a problem hiding this comment.
You don't need to load the bundle image since run bundle would be able to pull it itself.
Suggested change
| if tc.IsRunningOnKind() { | |
| By("loading the bundle image into Kind cluster") | |
| if tc.IsRunningOnKind() { | |
| By("loading the bundle image into Kind cluster") |
camilamacedo86
removed
the
do-not-merge/hold
reinvantveer
pushed a commit
to reinvantveer/operator-sdk
that referenced
this pull request
Feb 5, 2021
…th OLM (operator-framework#4144) **Description of the change:** - Move the olm helpers in the `hack/generate/samples/internal/pkg/utils.go` to `internal/testutils/olm.go`. Reason: allow samples and tests to use the same helper and keep it in a more appropriate place. - Remove the duplicates calls made in the e2e tests which are already done in the samples in the e2e tests - Use the e2e test the helper instead of duplicate the code. **Motivation for the change:** - Maintainability - Reduce CI effort by not calling make bundle twice. - Centralize the steps to integrate the projects with OLM and keep samples and e2e tests using the same func - Reduce the duplication of code as of the calls made Signed-off-by: reinvantveer <[email protected]>
rearl-scwx
pushed a commit
to rearl-scwx/operator-sdk
that referenced
this pull request
Feb 5, 2021
…th OLM (operator-framework#4144) **Description of the change:** - Move the olm helpers in the `hack/generate/samples/internal/pkg/utils.go` to `internal/testutils/olm.go`. Reason: allow samples and tests to use the same helper and keep it in a more appropriate place. - Remove the duplicates calls made in the e2e tests which are already done in the samples in the e2e tests - Use the e2e test the helper instead of duplicate the code. **Motivation for the change:** - Maintainability - Reduce CI effort by not calling make bundle twice. - Centralize the steps to integrate the projects with OLM and keep samples and e2e tests using the same func - Reduce the duplication of code as of the calls made Signed-off-by: rearl <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change:
hack/generate/samples/internal/pkg/utils.gotointernal/testutils/olm.go. Reason: allow samples and tests to use the same helper and keep it in a more appropriate place.Motivation for the change: