Scale Toolsmiths environment for ATs

* Scale to 3 Diego cells to handle AT workload
* Rich Gradle output for ATs in CI
* Clean more things in clean-env.sh

ci/images/release-ci-image/Dockerfile

@@ -21,3 +21,6 @@ RUN cd /usr/local/bin && curl -L https://github.com/cloudfoundry-incubator/credh
 
 RUN curl -L https://github.com/cloudfoundry/bosh-bootloader/releases/download/v8.4.40/bbl-v8.4.40_linux_x86-64 --output /usr/local/bin/bbl && \
     chmod +x /usr/local/bin/bbl
+
+RUN curl -L https://github.com/cloudfoundry/bosh-cli/releases/download/v6.4.3/bosh-cli-6.4.3-linux-amd64 --output /usr/local/bin/bosh && \
+    chmod +x /usr/local/bin/bosh

ci/scripts/acceptance-tests.sh

@@ -7,6 +7,7 @@ readonly DEFAULT_ORG="${DEFAULT_ORG:?must be set}"
 readonly DEFAULT_SPACE="${DEFAULT_SPACE:?must be set}"
 readonly SKIP_SSL_VALIDATION="${SKIP_SSL_VALIDATION:?must be set}"
 readonly ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE:-true}"
+readonly DEPLOYMENT_DIRECTORY="$(mktemp -d)"
 
 declare API_HOST
 readonly API_PORT=443
@@ -21,12 +22,28 @@ discover_environment() {
 
   eval "$(bbl print-env --metadata-file "$TOOLSMITH_ENV_INPUT/metadata")"
 
-  API_HOST="$(jq -r .cf.api_url < "$TOOLSMITH_ENV_INPUT/metadata")"
+  API_HOST="$(jq -r .cf.api_url <"$TOOLSMITH_ENV_INPUT/metadata")"
   PASSWORD="$(credhub get -n "/bosh-${env_name}/cf/cf_admin_password" -q)"
   CLIENT_SECRET="$(credhub get -n "/bosh-${env_name}/cf/uaa_admin_client_secret" -q)"
 }
 
-prepare_environment() {
+prepare_cf_deployment() {
+  pushd "$DEPLOYMENT_DIRECTORY" > /dev/null
+
+  bosh --deployment cf manifest > manifest.yml
+
+  cat << EOF > ops.yml
+- type: replace
+  path: /instance_groups/name=diego-cell/instances
+  value: 3
+EOF
+
+  bosh --non-interactive --deployment cf deploy --ops-file ops.yml manifest.yml
+
+  popd > /dev/null
+}
+
+prepare_cf() {
   local test_instances_org
   test_instances_org="$DEFAULT_ORG-instances"
 
@@ -50,9 +67,9 @@ run_tests() {
   export SPRING_CLOUD_APPBROKER_ACCEPTANCETEST_CLOUDFOUNDRY_DEFAULT_SPACE="${DEFAULT_SPACE}"
   export SPRING_CLOUD_APPBROKER_ACCEPTANCETEST_CLOUDFOUNDRY_SKIP_SSL_VALIDATION="${SKIP_SSL_VALIDATION}"
   export TESTS_BROKERAPPPATH=build/libs/spring-cloud-app-broker-acceptance-tests.jar
-  ./gradlew -PacceptanceTests \
-  	-PonlyShowStandardStreamsOnTestFailure="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE}" \
-  	:spring-cloud-app-broker-acceptance-tests:test
+  ./gradlew --console rich -PacceptanceTests \
+    -PonlyShowStandardStreamsOnTestFailure="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE}" \
+    :spring-cloud-app-broker-acceptance-tests:test
 }
 
 main() {
@@ -61,11 +78,12 @@ main() {
   echo "Running tests against $API_HOST"
   echo
 
-  prepare_environment
+  prepare_cf_deployment
+  prepare_cf
 
-  pushd "git-repo" > /dev/null
-    run_tests
-  popd > /dev/null
+  pushd "git-repo" >/dev/null
+  run_tests
+  popd >/dev/null
 }
 
 main

scripts/clean-env.sh

@@ -87,12 +87,12 @@ cf routes
 cf target -o system -s system
 
 cf delete-org -f ${TEST_INSTANCES_ORG}
-cf create-org ${TEST_INSTANCES_ORG} -q runaway
+cf create-org ${TEST_INSTANCES_ORG}
 cf target -o ${TEST_INSTANCES_ORG}
 cf create-space ${TEST_SPACE}
 
 cf delete-org -f ${TEST_ORG}
-cf create-org ${TEST_ORG} -q runaway
+cf create-org ${TEST_ORG}
 cf target -o ${TEST_ORG}
 cf create-space ${TEST_SPACE}
 
@@ -100,3 +100,5 @@ cf target -o ${TEST_ORG} -s ${TEST_SPACE}
 
 cf delete-service-broker test-broker-create-instance-space-per-si -f
 cf delete-service-broker test-broker-create-instance-with-services -f
+cf delete-service-broker test-broker-update-with-new-services -f
+cf delete-service-broker test-broker-update-with-new-services-and-target -f