add cluster-launch-installer-src template

[ecordell]

Differences from cluster-launch-installer-e2e:

• Uses LOCAL_IMAGE_SRC instead of IMAGE_TESTS
• Removes gingko commands

[ecordell]

/assign @bbguimaraes

[bbguimaraes]

If you diff the two openshift-ansible templates, there's this section:

--- ci-operator/templates/cluster-launch-e2e.yaml
+++ ci-operator/templates/cluster-launch-src.yaml
…
@@ -57,11 +59,22 @@
       secret:
         secretName: ${JOB_NAME_SAFE}-cluster-profile

+    initContainers:
+    - name: cli
+      image: ${IMAGE_CLI}
+      volumeMounts:
+      - name: shared-tmp
+        mountPath: /tmp/shared
+      command:
+      - cp
+      - /usr/bin/oc
+      - /tmp/shared/oc
+
     containers:

     # Once admin.kubeconfig exists, executes shared tests

It is meant to copy the oc binary from the cli image to a shared directory to make it accessible to the test container, which uses the src image (i.e. the component image) and may not contain it.

[bbguimaraes]

This is missing these changes: #2062

[ecordell]

@bbguimaraes fixed - must've based this off of an older version of -e2e, sorry about that.

[bbguimaraes]

A few other discrepancies that show up in the diffs.

Also, can you put the blank lines back? They generate unnecessary noise when comparing the two templates (or remove them from the other file too, I don't really care either way).

[bbguimaraes]

-- name: IMAGE_TESTS
+- name: LOCAL_IMAGE_SRC
+  required: true
+- name: IMAGE_CLI

IMAGE_CLI needs to be a parameter of the template or we won't get its value from ci-operator.

[bbguimaraes]

-        export PATH=/usr/libexec/origin:$PATH
+        export PATH=/tmp/shared:$PATH

The binary is placed in a different location in this template.

[bbguimaraes]

-        cp "$(which oc)" /tmp/shared/

That's already done by the init container.

[bbguimaraes]

-        mkdir -p /tmp/output
-        cd /tmp/output

We can't cd out of the repository's directory or ${TEST_COMMAND} will likely fail.

[bbguimaraes]

-        trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
+        trap 'rc=$?; if test "${rc}" -ne 0; then touch /tmp/exit; fi; exit "${rc}"' EXIT

This one's still outstanding from #2062.

[ecordell]

To clarify - I should be checking /tmp/setup-success, right?

[ecordell]

@bbguimaraes Addressed comments

Full diff of e2e to src:

15c15,17
< - name: IMAGE_TESTS
---
> - name: LOCAL_IMAGE_SRC 
>   required: true
> - name: IMAGE_CLI
60c62,71
< 
---
>     initContainers:
>     - name: cli
>       image: ${IMAGE_CLI}
>       volumeMounts:
>       - name: shared-tmp
>         mountPath: /tmp/shared
>       command:
>       - cp
>       - /usr/bin/oc
>       - /tmp/shared/oc
65c76
<       image: ${IMAGE_TESTS}
---
>       image: ${LOCAL_IMAGE_SRC}
92c103
<         export PATH=/usr/libexec/origin:$PATH
---
>         export PATH=/tmp/shared:$PATH
96,98c107
< 
<         cp "$(which oc)" /tmp/shared/
< 
---
>         
180,183c189
< 
<         mkdir -p /tmp/output
<         cd /tmp/output
< 
---
>         
193,211d198
<         # TODO: the test binary should really be a more structured command - most of these flags should be
<         #       autodetected from the running cluster.
<         # TODO: bump nodes up to 40 again
<         function run-tests() {
<           if [[ -n "${TEST_FOCUS:-}" ]]; then
<             ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
<               -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
<               -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
<               -test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
<           fi
<           if [[ -n "${TEST_FOCUS_SERIAL:-}" ]]; then
<             ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
<               -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL:-"\\[local\\]"}" \
<               -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
<               -test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
<           fi
<           exit ${rc:-0}
<         }
< 

[wking]

With the small difference between e2e and src, is this something we could be controlling with an environment variable or some such to keep all the code in cluster-launch-installer-e2e.yaml?

[ecordell]

@wking I don't use Templates enough to speak authoritatively, but I don't think there are good ways to conditionally swap which parameter gets used in one place. The main concern is swapping image from ${IMAGE_TESTS} to ${LOCAL_IMAGE_SRC}.

For this PR I'm just copying the pattern for pre-4.0 templates.

[bbguimaraes]

@wking: as @ecordell said, the fundamental difference between the two templates is which image to use for the test container, which is not something that can be switched with an environment variable.

@ecordell: comparing that diff and the diff between the openshift-ansible templates, the only thing missing is:

release/ci-operator/templates/cluster-launch-src.yaml

Line 123 in e284409

export ARTIFACT_DIR=/tmp/artifacts

Add that and we should be done with this.

[ecordell]

@bbguimaraes Added the ARTIFACT_DIR env var

[bbguimaraes]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bbguimaraes, ecordell

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [bbguimaraes]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment