Skip to content

move templates out of stubs directories, and generate clean manifests #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Dec 3, 2015
Merged

move templates out of stubs directories, and generate clean manifests #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
acceptance_tests_properties:
api: api.bosh-lite.com
apps_domain: bosh-lite.com
admin_user: admin
admin_password: admin
secure_address: 10.244.0.42:4001
skip_cert_verify: true
9 changes: 9 additions & 0 deletions manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
smoke_tests_properties:
api: api.bosh-lite.com
apps_domain: bosh-lite.com
org: smoke-tests
space: tests
user: admin
password: admin
skip_cert_verify: true
13 changes: 7 additions & 6 deletions ...osh-lite-stubs/diego-acceptance-tests.yml → ...est-generation/diego-acceptance-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ jobs:
resource_pool: errand
properties:
acceptance_tests:
admin_password: admin
admin_user: admin
api: api.bosh-lite.com
apps_domain: bosh-lite.com
secure_address: 10.244.0.42:4001
skip_ssl_validation: true
api: (( acceptance_tests_properties.api ))
apps_domain: (( acceptance_tests_properties.apps_domain ))
admin_user: (( acceptance_tests_properties.admin_user ))
admin_password: (( acceptance_tests_properties.admin_password ))
secure_address: (( acceptance_tests_properties.secure_address ))
skip_ssl_validation: (( acceptance_tests_properties.skip_cert_verify ))

# The keys below should not be included in the final stub
config_from_cf: (( merge ))
iaas_settings: (( merge ))
acceptance_tests_properties: (( merge ))
0 ...ion/benchmark-errand-stubs/benchmarks.yml → manifest-generation/diego-benchmarks.yml
View file
Open in desktop
File renamed without changes.
17 changes: 9 additions & 8 deletions ...ion/bosh-lite-stubs/diego-smoke-tests.yml → manifest-generation/diego-smoke-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ jobs:
resource_pool: errand
properties:
diego:
ssl:
skip_cert_verify: true
smoke_tests:
api: api.bosh-lite.com
org: smoke-tests
password: admin
space: tests
user: admin
apps_domain: bosh-lite.com
api: (( smoke_tests_properties.api ))
apps_domain: (( smoke_tests_properties.apps_domain ))
org: (( smoke_tests_properties.org ))
space: (( smoke_tests_properties.space ))
user: (( smoke_tests_properties.user ))
password: (( smoke_tests_properties.password ))
ssl:
skip_cert_verify: (( smoke_tests_properties.skip_cert_verify ))

# The keys below should not be included in the final stub
config_from_cf: (( merge ))
iaas_settings: (( merge ))
smoke_tests_properties: (( merge ))
19 changes: 16 additions & 3 deletions scripts/generate-benchmarks-manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Copy one of the default_benchmark_properties files from manifest-generation/benc
exit 1
}

benchmark_stub=$(dirname $0)/../manifest-generation/benchmark-errand-stubs/benchmarks.yml
benchmark_template=$(dirname $0)/../manifest-generation/diego-benchmarks.yml
bosh_template=$(dirname $0)/../manifest-generation/misc-templates/bosh.yml
diego_properties=$(dirname $0)/../manifest-generation/benchmark-errand-stubs/diego-properties.yml
tmpdir=$(mktemp -d /tmp/benchmark-manifest.XXXXX)
diego_yml=$1
Expand All @@ -43,5 +44,17 @@ if [ ! -f "${iaas_settings}" ]; then
usage
fi

spiff merge ${diego_properties} ${diego_yml} > ${tmpdir}/diego_properties.yml
spiff merge ${benchmark_stub} ${tmpdir}/diego_properties.yml ${benchmark_properties} ${iaas_settings}
spiff merge \
${diego_properties} \
${diego_yml} \
> ${tmpdir}/diego_properties.yml
spiff merge \
${benchmark_template} \
${tmpdir}/diego_properties.yml \
${benchmark_properties} \
${iaas_settings} \
> ${tmpdir}/diego-benchmarks.yml
spiff merge \
${bosh_template} \
${tmpdir}/diego-benchmarks.yml

16 changes: 14 additions & 2 deletions scripts/generate-bosh-lite-manifests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,27 @@ $scripts_path/generate-deployment-manifest \
> ${tmpdir}/config-from-cf.yml

spiff merge \
manifest-generation/bosh-lite-stubs/diego-acceptance-tests.yml \
manifest-generation/diego-acceptance-tests.yml \
manifest-generation/bosh-lite-stubs/iaas-settings.yml \
${tmpdir}/config-from-cf.yml \
manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml \
> ${tmpdir}/diego-acceptance-tests.yml

spiff merge \
manifest-generation/misc-templates/bosh.yml \
${tmpdir}/diego-acceptance-tests.yml \
> ${DIEGO_MANIFESTS_DIR}/diego-acceptance-tests.yml

spiff merge \
manifest-generation/bosh-lite-stubs/diego-smoke-tests.yml \
manifest-generation/diego-smoke-tests.yml \
manifest-generation/bosh-lite-stubs/iaas-settings.yml \
${tmpdir}/config-from-cf.yml \
manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml \
> ${tmpdir}/diego-smoke-tests.yml

spiff merge \
manifest-generation/misc-templates/bosh.yml \
${tmpdir}/diego-smoke-tests.yml \
> ${DIEGO_MANIFESTS_DIR}/diego-smoke-tests.yml

$scripts_path/generate-benchmarks-manifest \
Expand Down