From 615906cccacdef9d99780dce3263a0fef6cfb793 Mon Sep 17 00:00:00 2001 From: CJ Cullen Date: Wed, 29 Apr 2015 10:52:16 -0700 Subject: [PATCH] Fix parallel-e2e.sh to work on my macbook (bash v3.2) --- hack/parallel-e2e.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/parallel-e2e.sh b/hack/parallel-e2e.sh index a26ba0ba9a0..0642859b84d 100755 --- a/hack/parallel-e2e.sh +++ b/hack/parallel-e2e.sh @@ -40,7 +40,7 @@ function up-clusters { local cluster_dir=${KUBE_ROOT}/_output/e2e/${KUBE_GCE_INSTANCE_PREFIX} mkdir -p ${cluster_dir} export KUBECONFIG=${cluster_dir}/.kubeconfig - go run hack/e2e.go -up -v |& tee ${cluster_dir}/up.log & + go run hack/e2e.go -up -v 2>&1 | tee ${cluster_dir}/up.log & done fail=0 @@ -61,7 +61,7 @@ function run-tests { local cluster_dir=${KUBE_ROOT}/_output/e2e/${KUBE_GCE_INSTANCE_PREFIX} export KUBECONFIG=${cluster_dir}/.kubeconfig export E2E_REPORT_DIR=${cluster_dir} - go run hack/e2e.go -test --test_args="--ginkgo.noColor" "${@:-}" -down |& tee ${cluster_dir}/e2e.log & + go run hack/e2e.go -test --test_args="--ginkgo.noColor" "${@:-}" -down 2>&1 | tee ${cluster_dir}/e2e.log & done wait