Skip to content

ci-operator/templates/openshift: Drop 'openshift-install version' #2962

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 1 commit into from
Feb 27, 2019
Merged

ci-operator/templates/openshift: Drop 'openshift-install version' #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,6 @@ objects:
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@ objects:
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
Expand Down
11 changes: 5 additions & 6 deletions ci-operator/templates/openshift/openshift-ansible/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ ignition file first.

## Containers
* `config` prepares config files in `IMAGE_INSTALLER` image:
1. records openshift-installer version
2. sets necessary env vars based on cluster type (libvirt install on GCP)
3. runs `create install-config`
4. modifies install configs to change a number of masters and workers created
5. runs `create ignition-configs` to produce `boostrap.ign` in `/tmp/artifacts/installer`
6. creates `/tmp/config-success` on success, otherwise - `/tmp/exit`
1. sets necessary env vars based on cluster type (libvirt install on GCP)
2. runs `create install-config`
3. modifies install configs to change a number of masters and workers created
4. runs `create ignition-configs` to produce `boostrap.ign` in `/tmp/artifacts/installer`
5. creates `/tmp/config-success` on success, otherwise - `/tmp/exit`

* `setup` runs ansible playbook in `IMAGE_ANSIBLE` image:
1. waits for `/tmp/config-success` to appear
Expand Down
3 changes: 0 additions & 3 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,6 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/config-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${OPENSHIFT_INSTALL_PULL_SECRET_PATH}")
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,6 @@ objects:
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
Expand Down