Skip to content

Commit 6eb2291

Browse files
committed
Update acceptance-tests.sh for bosh lite environments
1 parent d44c430 commit 6eb2291

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

ci/scripts/acceptance-tests.sh

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,12 @@ declare CLIENT_SECRET
1414
readonly DEFAULT_ORG="test"
1515
readonly DEFAULT_SPACE="development"
1616

17-
DEPLOYMENT_DIRECTORY="$(mktemp -d)"
18-
readonly DEPLOYMENT_DIRECTORY
19-
2017
discover_environment() {
21-
local env_name
22-
env_name=$(jq -r .name <"${METADATA_FILE}")
23-
2418
eval "$(bbl print-env --metadata-file "${METADATA_FILE}")"
2519

2620
CF_API_HOST="$(jq -r .cf.api_url <"${METADATA_FILE}")"
27-
CF_PASSWORD="$(credhub get -n "/bosh-${env_name}/cf/cf_admin_password" -q)"
28-
CLIENT_SECRET="$(credhub get -n "/bosh-${env_name}/cf/uaa_admin_client_secret" -q)"
29-
}
30-
31-
prepare_cf_deployment() {
32-
pushd "$DEPLOYMENT_DIRECTORY" >/dev/null
33-
34-
bosh --deployment cf manifest >manifest.yml
35-
36-
cat <<EOF >ops.yml
37-
- type: replace
38-
path: /instance_groups/name=diego-cell/vm_type
39-
value: large
40-
- type: replace
41-
path: /instance_groups/name=router/vm_type
42-
value: large
43-
- type: replace
44-
path: /instance_groups/name=api/vm_type
45-
value: large
46-
EOF
47-
48-
bosh --non-interactive --deployment cf deploy --ops-file ops.yml manifest.yml
49-
50-
popd >/dev/null
21+
CF_PASSWORD="$(credhub get -n "/bosh-lite/cf/cf_admin_password" -q)"
22+
CLIENT_SECRET="$(credhub get -n "/bosh-lite/cf/uaa_admin_client_secret" -q)"
5123
}
5224

5325
prepare_cf() {
@@ -98,7 +70,6 @@ main() {
9870

9971
echo "Running tests against ${CF_API_HOST}"
10072
echo
101-
prepare_cf_deployment
10273
prepare_cf
10374

10475
run_tests

0 commit comments

Comments
 (0)