From 1185bed3705b2055fb3149a9351dabf3650c0935 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Tue, 31 Jan 2017 16:19:36 +0000 Subject: [PATCH] Changed default number of test machines to 3. CircleCI keeps 10 nodes in order to speed up the build, but the default is 3, as this is the minimum required to run any test. This should make more sense as a default for a developer to quickly start an environment and iterate. --- circle.yml | 1 + test/run-integration-tests.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 39740407..e1ed6bd9 100644 --- a/circle.yml +++ b/circle.yml @@ -14,6 +14,7 @@ machine: PATH: $PATH:$HOME/.local/bin CLOUDSDK_CORE_DISABLE_PROMPTS: 1 STATE: /home/ubuntu/state.env + NUM_HOSTS: 10 # Base name of VMs for integration tests: NAME: test-$CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX TEST_VMS_SETUP_OUTPUT_FILE: $CIRCLE_ARTIFACTS/test_vms_setup_output.txt diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index 5b0c40c5..8d9a19e9 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -24,7 +24,7 @@ APP="weave-net" PROJECT="weave-net-tests" # Only used when PROVIDER is gcp, by tools/provisioning/config.sh. NAME=${NAME:-"$(whoami | sed -e 's/[\.\_]*//g' | cut -c 1-4)"} PROVIDER=${PROVIDER:-gcp} # Provision using provided provider, or Google Cloud Platform by default. -NUM_HOSTS=${NUM_HOSTS:-10} +NUM_HOSTS=${NUM_HOSTS:-3} PLAYBOOK=${PLAYBOOK:-setup_weave-net_test.yml} TESTS=${TESTS:-} RUNNER_ARGS=${RUNNER_ARGS:-""}