From 4847cb5477d6c125ada8ed9a2ac3e3ef7e2e51ab Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Tue, 14 Jan 2020 14:48:32 -0500 Subject: [PATCH] clean up install log output --- .../templates/openshift/endurance/endurance-install.yaml | 2 +- .../installer/cluster-launch-installer-custom-test-image.yaml | 2 +- .../openshift/installer/cluster-launch-installer-e2e.yaml | 2 +- .../openshift/installer/cluster-launch-installer-metal-e2e.yaml | 2 +- .../installer/cluster-launch-installer-openstack-e2e.yaml | 2 +- .../openshift/installer/cluster-launch-installer-ovirt-e2e.yaml | 2 +- .../openshift/installer/cluster-launch-installer-src.yaml | 2 +- .../openshift/installer/cluster-launch-installer-upi-e2e.yaml | 2 +- .../openshift/installer/cluster-launch-installer-upi-src.yaml | 2 +- .../openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci-operator/templates/openshift/endurance/endurance-install.yaml b/ci-operator/templates/openshift/endurance/endurance-install.yaml index 9f7aee1e87962..629207e218d4a 100644 --- a/ci-operator/templates/openshift/endurance/endurance-install.yaml +++ b/ci-operator/templates/openshift/endurance/endurance-install.yaml @@ -442,7 +442,7 @@ objects: exit 1 fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep -v password & wait "$!" echo "##################### start cluster metadata.json ##########################" diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml index 821e2a0221a11..cbc9f2e21631d 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml @@ -627,7 +627,7 @@ objects: EOF fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep -v password & wait "$!" # Performs cleanup of all created resources diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index f3cc0b79acf2d..655fea0ac4384 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -694,7 +694,7 @@ objects: echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep -v password & wait "$!" # Performs cleanup of all created resources diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml index fc2d6fffd1f8e..f9a34075dd5d0 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml @@ -486,7 +486,7 @@ objects: update_image_registry & echo "Completing UPI setup" - openshift-install --dir=/tmp/artifacts/installer wait-for install-complete & + openshift-install --dir=/tmp/artifacts/installer wait-for install-complete 2>&1 | grep -v password & wait "$!" # Performs cleanup of all created resources diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml index bdae322c40922..053dc8bf0bed6 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml @@ -380,7 +380,7 @@ objects: echo "Forcing OpenShiftSDN by modifying manifests" sed -i -e 's/networkType: .*$/networkType: OpenShiftSDN/g' /tmp/artifacts/installer/manifests/cluster-network-02-config.yml fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug 2>&1 | grep -v password & wait "$!" INGRESS_PORT=$(openstack port list --format value -c Name | awk "/${CLUSTER_NAME}.*-ingress-port/ {print}") diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml index cfcc3c8589647..becb94cee863a 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml @@ -419,7 +419,7 @@ objects: # What we're doing here is we generate manifests first and force that OpenShift SDN is configured. TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug 2>&1 | grep -v password & wait "$!" install_exit_status=$? export KUBECONFIG=/tmp/artifacts/installer/auth/kubeconfig diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index e1201ccdea719..22f4296e6cff4 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -534,7 +534,7 @@ objects: echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep -v password & wait "$!" # Performs cleanup of all created resources diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml index dd77c13450cc8..d06fb53ed41b7 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml @@ -1817,7 +1817,7 @@ objects: fi echo "Completing UPI setup" - openshift-install --dir=/tmp/artifacts/installer wait-for install-complete & + openshift-install --dir=/tmp/artifacts/installer wait-for install-complete 2>&1 | grep -v password & wait "$!" touch /tmp/install-complete diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml index c9fe3245e1b78..af52259a13e0a 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml @@ -1034,7 +1034,7 @@ objects: fi echo "Completing UPI setup" - openshift-install --dir=/tmp/artifacts/installer wait-for install-complete & + openshift-install --dir=/tmp/artifacts/installer wait-for install-complete 2>&1 | grep -v password & wait "$!" touch /tmp/install-complete diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml index 6cfe47da497b8..b01ca0a66c648 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml @@ -283,7 +283,7 @@ objects: exit 1 fi - TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep -v password & wait "$!" # Runs scale up playbook