Merge pull request #1518 from wking/installer-local-smoke

Revert recent installer smoke-test changes
openshift · Sep 14, 2018 · d69dbc6 · d69dbc6
2 parents b157eac + fcfdafa
commit d69dbc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ci-operator/config/openshift/installer/master.yaml b/ci-operator/config/openshift/installer/master.yaml
@@ -24,7 +24,6 @@ images:
       - build
   to: installer
 - dockerfile_path: images/tectonic-installer/Dockerfile.ci
-  optional: true
   from: base-smoke
   inputs:
     bin:
@@ -36,7 +35,6 @@ images:
       - build
   to: installer-bazel
 - dockerfile_path: images/installer-origin-release/Dockerfile.ci
-  optional: true
   from: installer-bazel
   to: installer-smoke
 resources:

diff --git a/ci-operator/templates/cluster-launch-installer-e2e-smoke.yaml b/ci-operator/templates/cluster-launch-installer-e2e-smoke.yaml
@@ -16,7 +16,7 @@ parameters:
   required: true
 - name: IMAGE_TESTS
   required: true
-- name: LOCAL_IMAGE_INSTALLER_SMOKE
+- name: IMAGE_INSTALLER_SMOKE
   required: true
 - name: CLUSTER_TYPE
   required: true
@@ -71,7 +71,7 @@ objects:
       - /tmp/shared/oc
 
     - name: smoke-test
-      image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
+      image: ${IMAGE_INSTALLER_SMOKE}
       volumeMounts:
       - name: shared-tmp
         mountPath: /tmp/shared
@@ -84,7 +84,7 @@ objects:
 
     # Once admin.kubeconfig exists, executes shared tests
     - name: test
-      image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
+      image: ${IMAGE_INSTALLER_SMOKE}
       resources:
         requests:
           cpu: 1
@@ -156,7 +156,7 @@ objects:
 
     # Runs an install
     - name: setup
-      image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
+      image: ${IMAGE_INSTALLER_SMOKE}
       volumeMounts:
       - name: shared-tmp
         mountPath: /tmp
@@ -257,7 +257,7 @@ objects:
 
     # Performs cleanup of all created resources
     - name: teardown
-      image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
+      image: ${IMAGE_INSTALLER_SMOKE}
       volumeMounts:
       - name: shared-tmp
         mountPath: /tmp/shared