Make 210_dns_cross_hosts_test.sh excercise gossip dns tombstones.
Also, make gce.sh less verbose, and do the env dance correctly.
This commit is contained in:
1 parent
23ad547db4
commit
6e5995964d
3 files changed
+32
-7
No files matched your search
+5
-5
@@ -5,7 +5,7 @@
|
||||
# ./gce.sh destroy - tear down the VMs
|
||||
# ./gce.sh make_template - make a fresh VM template; update TEMPLATE_NAME first!
|
||||
|
||||
set -ex
|
||||
set -e
|
||||
|
||||
KEY_FILE=/tmp/gce_private_key.json
|
||||
SSH_KEY_FILE=$HOME/.ssh/gce_ssh_key
|
||||
@@ -20,7 +20,7 @@ if [ -n "$CIRCLECI" ]; then
|
||||
fi
|
||||
|
||||
# Setup authentication
|
||||
gcloud auth activate-service-account --key-file $KEY_FILE
|
||||
gcloud auth activate-service-account --key-file $KEY_FILE 1>/dev/null
|
||||
gcloud config set project $PROJECT
|
||||
|
||||
function vm_names {
|
||||
@@ -120,9 +120,9 @@ function hosts {
|
||||
hosts="$hostname $hosts"
|
||||
args="--add-host=$hostname:$(internal_ip $name) $args"
|
||||
done
|
||||
export SSH=ssh
|
||||
export HOSTS="$hosts"
|
||||
export WEAVE_DOCKER_ARGS="$args"
|
||||
echo export SSH=ssh
|
||||
echo export HOSTS=\"$hosts\"
|
||||
echo export WEAVE_DOCKER_ARGS=\"$args\"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
|
||||
Reference in new issue
Block a user