Skip to content
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

Jump to bottom

ci-operator/step-registry/ipi/install: Drop TF_LOG from 'create manifests' #8299

Merged
merged 1 commit into from
Apr 20, 2020
Merged

ci-operator/step-registry/ipi/install: Drop TF_LOG from 'create manifests' #8299

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
5 changes: 2 additions & 3 deletions ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ cp "${SHARED_DIR}/install-config.yaml" "${dir}/"
mkdir -p ~/.ssh
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/


TF_LOG=debug openshift-install --dir="${dir}" create manifests
openshift-install --dir="${dir}" create manifests &
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a change that we should make in all of the places where openshift-install create manifests is called?

$ grep -rnE ./ci-operator/ -e "openshift-install (.* )?create manifests"
./ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml:439:        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml:1136:          openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml:1163:          openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml:1221:            openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml:1267:            openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml:770:            openshift-install --dir=/tmp/artifacts/installer/ create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml:779:          openshift-install --dir=/tmp/artifacts/installer/ create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml:555:            openshift-install --dir=/tmp/artifacts/installer/ create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml:402:        openshift-install --dir=/tmp/artifacts/installer/ create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml:644:            openshift-install --dir=/tmp/artifacts/installer/ create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml:385:        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml:417:          openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml:442:          openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml:501:            openshift-install --dir=/tmp/artifacts/installer create manifests
./ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml:518:        mock-nss.sh openshift-install create manifests --dir=/tmp/artifacts/installer
./ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh:39:TF_LOG=debug openshift-install --dir="${dir}" create manifests

wait "$!"

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


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

set +e
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ ref:
cpu: 1000m
memory: 2Gi
documentation: |-
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.
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.