diff options
| author |   marios <marios@redhat.com> | 2013-11-29 15:12:33 +0200 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2013-12-17 15:53:08 +0200 |
| commit | c9ce27c981d74c18f844fa71339c0177c3f76b28 (patch) | |
| tree | 79816c9ffb800bcf3fc47ddc7197cff285ddc761 /test_merge.bash | |
| parent | f6289d012740c730ac1b9b0ea8a3842f8c72149e (diff) | |
Make merge.py installable as a package using pbr
Now that merge.py is invokable from another script
(Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that
review, it makes sense to offer a nicer way to consume the merge
functionality.
Once you git clone tripleo-heat-templates you can python setup.py
install and get /usr/bin/tripleo_heat_merge as well as a
tripleo_heat_merge package in python2.7/site-packages.
Makefile edits required because we moved merge.py into the
tripleo_heat_merge directory for the packaging.
Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
Diffstat (limited to 'test_merge.bash')
| -rwxr-xr-x | test_merge.bash | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test_merge.bash b/test_merge.bash index e6bfb192..2f8a4cc9 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -23,10 +23,11 @@ run_test() { cleanup } echo -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 +merge_py="./tripleo_heat_merge/merge.py" +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 echo trap - EXIT exit $fail |