diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-01-28 19:20:40 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-01-29 01:39:27 +1300 |
| commit | c071255ad6bf1fb2c9db6799e96b509295f53fc9 (patch) | |
| tree | caf081f072674cbb9861308f2e5a617157370f3d /test_merge.bash | |
| parent | 23c8aac2bacfee96e0faedb84d0b72893f13c6ec (diff) | |
Make scaling out a feature for merge.py.
This is a simple implementation designed to work with our current
non-HOT approach. We need to adjust our templates a little to support
this - though future work could make that better, it's orthogonal to
this effort.
Change-Id: I555617e5f24a5882de915f057dc02e008c81e753
Diffstat (limited to 'test_merge.bash')
| -rwxr-xr-x | test_merge.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash index 61462f66..f9bc7fb6 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -28,6 +28,7 @@ run_test "python $merge_py examples/source.yaml" examples/source_lib_result.yaml run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.yaml run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml run_test "python $merge_py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml +run_test "python $merge_py --scale NovaCompute=3 examples/scale1.yaml" examples/scale_result.yaml echo trap - EXIT exit $fail |