github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Smith 2014-06-16 19:27:59 -07:00
parent c534d070e5
commit c27ad1390d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/integration-test.sh
View File

@ -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

2
hack/local-up-cluster.sh
View File

@ -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

2
hack/local-up.sh
View File

@ -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