diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-13 20:05:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-13 20:05:17 +0000 |
| commit | f797a2eadd656591273456664186fb3e8ad26804 (patch) | |
| tree | 6258341f1bbb62f10fcdf6133c9415ca61241043 /test_merge.bash | |
| parent | 8a99e7d461f211f43751d5c72c8dbc5d1ae05ead (diff) | |
| parent | 3e35d53061cb65032373ca3c0104cde4720af1f0 (diff) | |
Merge "Make removing nodes from scaled items possible."
Diffstat (limited to 'test_merge.bash')
| -rwxr-xr-x | test_merge.bash | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash index d076f50a..de29d075 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -36,6 +36,8 @@ run_test "python $merge_py --hot examples/source_include_subkey_hot.yaml" exampl run_test "python $merge_py --hot examples/launchconfig1_hot.yaml examples/launchconfig2_hot.yaml" examples/launchconfig_result_hot.yaml run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale1_hot.yaml" examples/scale_result_hot.yaml run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml +run_test "python $merge_py --hot --scale NovaCompute=5,1,2 examples/scale_map_hot.yaml" examples/scale_map_result_hot_blacklist.yaml +run_test "python $merge_py --hot --scale NovaCompute=3, examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml echo trap - EXIT exit $fail |