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

Fix parallel-e2e.sh to work on my macbook (bash v3.2) #7513

Merged
merged 1 commit into from
Apr 29, 2015
Merged

Fix parallel-e2e.sh to work on my macbook (bash v3.2) #7513

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions hack/parallel-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down