X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=test_merge.bash;h=de29d075c6e7b6f47a01fa3632852d6600a0f919;hb=6c6384e901f6e5925ed69738683cf5849d85b7d4;hp=61462f66224611bd9a7ac65afbe556ee32259835;hpb=cd9fce908620ccf372806a48ac9e31ebbc812d02;p=apex-tripleo-heat-templates.git diff --git a/test_merge.bash b/test_merge.bash index 61462f66..de29d075 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -28,6 +28,16 @@ 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 +run_test "python $merge_py --scale NovaCompute=3 examples/scale_map.yaml" examples/scale_map_result.yaml +run_test "python $merge_py --hot examples/source_hot.yaml" examples/source_lib_result_hot.yaml +run_test "python $merge_py --hot examples/source2_hot.yaml" examples/source2_lib_result_hot.yaml +run_test "python $merge_py --hot examples/source_include_subkey_hot.yaml" examples/source_include_subkey_result_hot.yaml +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