X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=test_merge.bash;h=19d75377d8cc4ac6b4db36eefddd7133e2aa557c;hb=24bc7995d1dba72b3a307d07d000ed0a1c908080;hp=61462f66224611bd9a7ac65afbe556ee32259835;hpb=cd9fce908620ccf372806a48ac9e31ebbc812d02;p=apex-tripleo-heat-templates.git diff --git a/test_merge.bash b/test_merge.bash index 61462f66..19d75377 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -28,6 +28,8 @@ 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 echo trap - EXIT exit $fail