Porting template based test to multi-stage testing

ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml

@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.2"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml

@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.3"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/odo/openshift-odo-master__v4.4.yaml

@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.4"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/odo/openshift-odo-master__v4.5.yaml

@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.5"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,17 +26,30 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e
-  commands: scripts/openshiftci-presubmit-all-tests.sh
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
-  secret:
-    mount_path: /tmp/secret
-    name: odo-secret
+    test:
+    - as: integration-e2e-steps
+      commands: scripts/openshiftci-presubmit-all-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/jobs/openshift/odo/openshift-odo-master-periodics.yaml

@@ -23,17 +23,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.2
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -46,9 +38,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -68,9 +57,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -101,17 +87,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.3
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -124,9 +102,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -146,9 +121,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -179,17 +151,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.4
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -202,9 +166,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -224,9 +185,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -257,17 +215,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.5
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -280,9 +230,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -302,9 +249,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred