diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2015-09-15 01:13:30 -0400 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2015-09-15 01:15:33 -0400 |
| commit | 904b8ca27b9d0d4866c59daad865ee36611119ec (patch) | |
| tree | 4c8bbd3a569bb014820d015b8bfd02ac00d6ff46 /test/integration/roles/test_win_msi | |
| parent | 0300294f6ef2097caabb1ac130d5edd5fa7562b6 (diff) | |
| download | ansible-904b8ca27b9d0d4866c59daad865ee36611119ec.tar.gz | |
Update win_msi tests to specify msi url and paths via variables.
Diffstat (limited to 'test/integration/roles/test_win_msi')
| -rw-r--r-- | test/integration/roles/test_win_msi/defaults/main.yml | 6 | ||||
| -rw-r--r-- | test/integration/roles/test_win_msi/tasks/main.yml | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/test/integration/roles/test_win_msi/defaults/main.yml b/test/integration/roles/test_win_msi/defaults/main.yml new file mode 100644 index 0000000000..6e79dcd146 --- /dev/null +++ b/test/integration/roles/test_win_msi/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +msi_url: http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.22/7z922-x64.msi +msi_download_path: "C:\\Program Files\\7z922-x64.msi" +msi_install_path: "C:\\Program Files\\7-Zip" +msi_product_code: "{23170F69-40C1-2702-0922-000001000000}" diff --git a/test/integration/roles/test_win_msi/tasks/main.yml b/test/integration/roles/test_win_msi/tasks/main.yml index aa5363159a..1ac467212a 100644 --- a/test/integration/roles/test_win_msi/tasks/main.yml +++ b/test/integration/roles/test_win_msi/tasks/main.yml @@ -18,19 +18,19 @@ - name: use win_get_url module to download msi win_get_url: - url: http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.22/7z922-x64.msi - dest: "C:\\Program Files\\7z922-x64.msi" + url: "{{msi_url}}" + dest: "{{msi_download_path}}" register: win_get_url_result -- name: make sure 7-zip is uninstalled +- name: make sure msi is uninstalled win_msi: - path: "{{ win_get_url_result.win_get_url.dest }}" + path: "{{msi_product_code|default(msi_download_path,true)}}" state: absent ignore_errors: true -- name: install 7zip msi +- name: install msi win_msi: - path: "{{ win_get_url_result.win_get_url.dest }}" + path: "{{msi_download_path}}" register: win_msi_install_result - name: check win_msi install result @@ -39,10 +39,10 @@ - "not win_msi_install_result|failed" - "win_msi_install_result|changed" -- name: install 7zip msi again with creates argument +- name: install msi again with creates argument win_msi: - path: "{{ win_get_url_result.win_get_url.dest }}" - creates: "C:\\Program Files\\7-Zip" + path: "{{msi_download_path}}" + creates: "{{msi_install_path}}" register: win_msi_install_again_result - name: check win_msi install again result @@ -51,9 +51,9 @@ - "not win_msi_install_again_result|failed" - "not win_msi_install_again_result|changed" -- name: uninstall 7zip msi +- name: uninstall msi win_msi: - path: "{{ win_get_url_result.win_get_url.dest }}" + path: "{{msi_download_path}}" state: absent register: win_msi_uninstall_result |