Skip to content

Commit 847cfbc

Browse files
committed
ci-operator/step-registry/ipi/install: Drop TF_LOG from 'create manifests'
No Terraform involved in creating manifests. Cleans up after d11bca7 (create a hybrid cluster and run the e2e tests on it, 2020-04-01, openshift#8075). Also removes trailing whitespace from the YAML documentation. Also backgrounds the 'create manifests' call and immediately waits for it, so we can gracefully handle TERM as described in 4472ace (ci-operator/templates/openshift/installer: Restore backgrounded 'create cluster', 2019-01-23, openshift#2680).
1 parent 28e2aa4 commit 847cfbc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ cp "${SHARED_DIR}/install-config.yaml" "${dir}/"
3535
mkdir -p ~/.ssh
3636
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/
3737

38-
39-
TF_LOG=debug openshift-install --dir="${dir}" create manifests
38+
openshift-install --dir="${dir}" create manifests &
39+
wait "$!"
4040

4141
while IFS= read -r -d '' item
4242
do
4343
manifest="$( basename "${item}" )"
4444
cp "${item}" "${dir}/manifests/${manifest##manifest_}"
4545
done < <( find "${SHARED_DIR}" -name "manifest_*.yml" -print0)
4646

47-
4847
TF_LOG=debug openshift-install --dir="${dir}" create cluster 2>&1 | grep --line-buffered -v password &
4948

5049
set +e

ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ref:
77
cpu: 1000m
88
memory: 2Gi
99
documentation: |-
10-
The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
10+
The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.

0 commit comments

Comments
 (0)