From 6dde5e5ee9959a936d96af322153843c9e09e24b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 2 Nov 2016 14:45:56 +0000 Subject: [PATCH] Add code-coverage options to weaver start --- prog/weave-kube/launch.sh | 2 +- test/840_weave_kube_3_test.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh index 188f9d83..1b3fab4c 100755 --- a/prog/weave-kube/launch.sh +++ b/prog/weave-kube/launch.sh @@ -86,7 +86,7 @@ if [ -z "$IPALLOC_INIT" ]; then IPALLOC_INIT="consensus=$(peer_count $KUBE_PEERS)" fi -/home/weave/weaver --port=6783 $BRIDGE_OPTIONS \ +/home/weave/weaver $EXTRA_ARGS --port=6783 $BRIDGE_OPTIONS \ --http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR --docker-api='' --no-dns \ --ipalloc-range=$IPALLOC_RANGE $NICKNAME_ARG \ --ipalloc-init $IPALLOC_INIT \ diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index 8e81ee72..14c31d95 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -24,7 +24,9 @@ run_on $HOST1 "sudo systemctl start kubelet && sudo kubeadm init --token=$TOKEN" run_on $HOST2 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP" run_on $HOST3 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP" -sed -e 's/imagePullPolicy: Always/imagePullPolicy: Never/' ../prog/weave-kube/weave-daemonset.yaml | run_on $HOST1 "kubectl apply -f -" +[ -n "$COVERAGE" ] && COVERAGE_ARGS="\\n env:\\n - name: EXTRA_ARGS\\n value: \"-test.coverprofile=/home/weave/cover.prof --\"" + +sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never$COVERAGE_ARGS%" ../prog/weave-kube/weave-daemonset.yaml | run_on $HOST1 "kubectl apply -f -" sleep 5