CFE-1108: Use upstream e2e to run using downstream images #11
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -41,6 +41,8 @@ var memcachedGVK = schema.GroupVersionKind{ | |||||
| Kind: "Memcached", | ||||||
| } | ||||||
|
|
||||||
| var skipSecretGeneration = "" | ||||||
|
There was a problem hiding this comment. Is there a reason to make it a global variable? If this variable is getting used only in There was a problem hiding this comment. I didn't want to make changes to the existing function definitions. That's why I used the global variable. |
||||||
|
|
||||||
| func getCli() *cli.CLI { | ||||||
| ansibleBundle, _ := plugin.NewBundleWithOptions( | ||||||
| plugin.WithName(golang.DefaultNameQualifier), | ||||||
|
|
@@ -127,21 +129,26 @@ func GenerateMoleculeSample(samplesPath string) []sample.Sample { | |||||
| ) | ||||||
| pkg.CheckError("attempting to create sample cli", err) | ||||||
|
|
||||||
| skipSecretGeneration = os.Getenv("SKIP_SECRET_GENERATION") | ||||||
|
There was a problem hiding this comment.
// env returns an environment variable or a default value if not specified.
func env(key string, defaultValue string) string {
val := os.Getenv(key)
if len(val) == 0 {
return defaultValue
}
return val
}
func isTrue(s string) bool {
v, _ := strconv.ParseBool(s)
return v
}
Suggested change
There was a problem hiding this comment. The usage of |
||||||
| var addIgnore sample.Sample | ||||||
|
|
||||||
| if skipSecretGeneration == "" { | ||||||
| addIgnore, err = samplecli.NewCliSample( | ||||||
| samplecli.WithCLI(getCli()), | ||||||
| samplecli.WithCommandContext(ansibleMoleculeMemcached.CommandContext()), | ||||||
| samplecli.WithGvk( | ||||||
| schema.GroupVersionKind{ | ||||||
| Group: "ignore", | ||||||
| Version: "v1", | ||||||
| Kind: "Secret", | ||||||
| }, | ||||||
| ), | ||||||
| samplecli.WithPlugins("ansible"), | ||||||
| samplecli.WithExtraApiOptions("--generate-role"), | ||||||
| samplecli.WithName(ansibleMoleculeMemcached.Name()), | ||||||
| ) | ||||||
| pkg.CheckError("creating ignore samples", err) | ||||||
| } | ||||||
|
|
||||||
| // remove sample directory if it already exists | ||||||
| err = os.RemoveAll(ansibleMoleculeMemcached.Dir()) | ||||||
|
|
@@ -158,9 +165,11 @@ func GenerateMoleculeSample(samplesPath string) []sample.Sample { | |||||
| err = e2e.AllowProjectBeMultiGroup(ansibleMoleculeMemcached) | ||||||
| pkg.CheckError("updating PROJECT file", err) | ||||||
|
|
||||||
| if skipSecretGeneration == "" { | ||||||
| ignoreGen := sample.NewGenerator(sample.WithNoInit(), sample.WithNoWebhook()) | ||||||
| err = ignoreGen.GenerateSamples(addIgnore) | ||||||
| pkg.CheckError("generating ansible molecule sample - ignore", err) | ||||||
| } | ||||||
|
|
||||||
| ImplementMemcached(ansibleMoleculeMemcached, bundleImage) | ||||||
|
There was a problem hiding this comment.
There was a problem hiding this comment. Same as #11 (comment). |
||||||
|
|
||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| FROM basebuilder AS builder | ||
|
There was a problem hiding this comment. Should we directly use the image tag to avoid overwriting in release config? There was a problem hiding this comment. It seems easier to maintain it like this. We won't have to update it on every branch cut and it will minimize the effort going forward. Also we just need the |
||
|
|
||
| COPY . /go/src/github.com/openshift/ansible-operator-plugins | ||
|
|
||
| ENV SKIP_SECRET_GENERATION=true | ||
|
|
||
| RUN cd /go/src/github.com/openshift/ansible-operator-plugins && \ | ||
| make generate | ||
|
|
||
| FROM openshift-ansible-operator-plugins | ||
|
|
||
| COPY --from=builder /go/src/github.com/openshift/ansible-operator-plugins/testdata/memcached-molecule-operator/requirements.yml ${HOME}/requirements.yml | ||
|
|
||
| RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ | ||
| && chmod -R ug+rwx ${HOME}/.ansible | ||
|
|
||
| COPY --from=builder /go/src/github.com/openshift/ansible-operator-plugins/testdata/memcached-molecule-operator/watches.yaml ${HOME}/watches.yaml | ||
| COPY --from=builder /go/src/github.com/openshift/ansible-operator-plugins/testdata/memcached-molecule-operator/roles/ ${HOME}/roles/ | ||
| COPY --from=builder /go/src/github.com/openshift/ansible-operator-plugins/testdata/memcached-molecule-operator/playbooks/ ${HOME}/playbooks/ | ||
|
|
||
|
There was a problem hiding this comment. The changes should happen in runtime inside the container, do we need to commit the changes? There was a problem hiding this comment. This code is updated as a result of running There was a problem hiding this comment. Also if we don't run |
|
There was a problem hiding this comment. Again, this is updated as a result of running |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SKIP_SECRET_GENERATIONENV can be exported withfalseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Explained in #11 (comment).