Skip to content

Commit

Permalink
Merge pull request #1517 from sallyom/use-local-img-smoke
Browse files Browse the repository at this point in the history
installer smoke_tests use LOCAL_IMAGE for optional installer-smoke image
  • Loading branch information
openshift-merge-robot authored Sep 14, 2018
2 parents c2eb846 + 50a2396 commit 86a4499
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ci-operator/templates/cluster-launch-installer-e2e-smoke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parameters:
required: true
- name: IMAGE_TESTS
required: true
- name: IMAGE_INSTALLER_SMOKE
- name: LOCAL_IMAGE_INSTALLER_SMOKE
required: true
- name: CLUSTER_TYPE
required: true
Expand Down Expand Up @@ -71,7 +71,7 @@ objects:
- /tmp/shared/oc

- name: smoke-test
image: ${IMAGE_INSTALLER_SMOKE}
image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
volumeMounts:
- name: shared-tmp
mountPath: /tmp/shared
Expand All @@ -84,7 +84,7 @@ objects:

# Once admin.kubeconfig exists, executes shared tests
- name: test
image: ${IMAGE_INSTALLER_SMOKE}
image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
resources:
requests:
cpu: 1
Expand Down Expand Up @@ -156,7 +156,7 @@ objects:
# Runs an install
- name: setup
image: ${IMAGE_INSTALLER_SMOKE}
image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
volumeMounts:
- name: shared-tmp
mountPath: /tmp
Expand Down Expand Up @@ -257,7 +257,7 @@ objects:
# Performs cleanup of all created resources
- name: teardown
image: ${IMAGE_INSTALLER_SMOKE}
image: ${LOCAL_IMAGE_INSTALLER_SMOKE}
volumeMounts:
- name: shared-tmp
mountPath: /tmp/shared
Expand Down

0 comments on commit 86a4499

Please sign in to comment.