Skip to content

K
k3s
Commit c27ad139 authored by Daniel Smith's avatar Daniel Smith
Browse files
Options

etcd does some trickery that was avoiding the pid capturing in our tests. Run in subshell.

parent c534d070
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
hack/integration-test.sh
View file @ c27ad139
...@@ -27,7 +27,7 @@ $(dirname $0)/build-go.sh ...@@ -27,7 +27,7 @@ $(dirname $0)/build-go.sh
ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX)
trap "rm -rf ${ETCD_DIR}" EXIT trap "rm -rf ${ETCD_DIR}" EXIT
etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log & (etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log) &
ETCD_PID=$! ETCD_PID=$!
sleep 5 sleep 5
......
hack/local-up-cluster.sh
View file @ c27ad139
...@@ -33,7 +33,7 @@ echo "Starting etcd" ...@@ -33,7 +33,7 @@ echo "Starting etcd"
ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX)
trap "rm -rf ${ETCD_DIR}" EXIT trap "rm -rf ${ETCD_DIR}" EXIT
etcd -name test -data-dir ${ETCD_DIR} &> /tmp/etcd.log & (etcd -name test -data-dir ${ETCD_DIR} &> /tmp/etcd.log) &
ETCD_PID=$! ETCD_PID=$!
sleep 5 sleep 5
......
hack/local-up.sh
View file @ c27ad139
...@@ -40,7 +40,7 @@ echo "Starting etcd" ...@@ -40,7 +40,7 @@ echo "Starting etcd"
ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX)
trap "rm -rf ${ETCD_DIR}" EXIT trap "rm -rf ${ETCD_DIR}" EXIT
etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log & (etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log) &
ETCD_PID=$! ETCD_PID=$!
sleep 5 sleep 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment