diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-07-08 12:14:28 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-01 10:49:59 +1200 |
| commit | d1d829e6aceba61532041d8499dc4ffd8055fbc2 (patch) | |
| tree | 17cc9b01eaca65d8c85df9f9acea2f4d3c54bf3f /test_merge.bash | |
| parent | 998c5dda9c6d3ddf0f654c71d4c172b7b6dd3e59 (diff) | |
merge.py --hot to process and generate HOT
This adds a --hot flag to merge.py which will assume source templates
are in the HOT format, and generate a HOT template artifact.
Tests have also been ported to HOT, along with some minor corrections
to the existing tests to make the source and result templates valid
heat templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: If18ff79f89456123c884a1ab2f910ce4cc9a6e0b
Diffstat (limited to 'test_merge.bash')
| -rwxr-xr-x | test_merge.bash | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash index 19d75377..d076f50a 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -30,6 +30,12 @@ run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_ 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 echo trap - EXIT exit $fail |