Skip to content

Revert recent installer smoke-test changes #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Sep 14, 2018
Merged

Revert recent installer smoke-test changes #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05e6f2d
Revert "installer smoke_tests use LOCAL_IMAGE for optional installer-…
wking Sep 14, 2018
fcfdafa
Revert "Make smoke test images for e2e-aws-smoke optional, so they do…
wking Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ci-operator/config/openshift/installer/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ images:
- build
to: installer
- dockerfile_path: images/tectonic-installer/Dockerfile.ci
optional: true
from: base-smoke
inputs:
bin:
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions ci-operator/templates/cluster-launch-installer-e2e-smoke.yaml
View file
Open in desktop
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: LOCAL_IMAGE_INSTALLER_SMOKE
- name: 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: ${LOCAL_IMAGE_INSTALLER_SMOKE}
image: ${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: ${LOCAL_IMAGE_INSTALLER_SMOKE}
image: ${IMAGE_INSTALLER_SMOKE}
resources:
requests:
cpu: 1
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down