From a8d8025e245b0add5e7e87d03cc5c00f4268ecc7 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 15 Apr 2019 15:50:57 +1000 Subject: [PATCH] DCD-224: Move to using tgz rather than self-instller. --- roles/jira_download/defaults/main.yml | 4 ++-- roles/jira_download/molecule/default/tests/test_default.py | 2 +- .../molecule/version_override/tests/test_default.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/jira_download/defaults/main.yml b/roles/jira_download/defaults/main.yml index aa1b514..941b4f2 100644 --- a/roles/jira_download/defaults/main.yml +++ b/roles/jira_download/defaults/main.yml @@ -5,6 +5,6 @@ atl_product_version_cache: "{{ atl_product_home_shared }}/{{ atl_product_edition atl_release_base_url: "https://product-downloads.atlassian.com/software" atl_product_base_url: "{{ atl_release_base_url }}/{{ atl_product_family }}/downloads" -atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_product_edition }}-{{ atl_product_version_file.stdout }}-x64.bin" -atl_product_download_filename: "{{ atl_product_edition }}.{{ atl_product_version_file.stdout }}.bin" +atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_product_edition }}-{{ atl_product_version_file.stdout }}.tar.gz" +atl_product_download_filename: "{{ atl_product_edition }}.{{ atl_product_version_file.stdout }}.tar.gz" atl_product_download: "{{ atl_installer_temp }}/{{ atl_product_download_filename }}" diff --git a/roles/jira_download/molecule/default/tests/test_default.py b/roles/jira_download/molecule/default/tests/test_default.py index 5ce3b2b..0f1599d 100644 --- a/roles/jira_download/molecule/default/tests/test_default.py +++ b/roles/jira_download/molecule/default/tests/test_default.py @@ -25,7 +25,7 @@ def test_latest_is_downloaded(host): upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest") upstream = upstream_fd.read().decode("UTF-8").strip() - installer = host.file('/opt/atlassian/tmp/jira-software.'+upstream+'.bin') + installer = host.file('/opt/atlassian/tmp/jira-software.'+upstream+'.tar.gz') assert installer.exists assert installer.user == 'root' assert installer.mode == 0o0755 diff --git a/roles/jira_download/molecule/version_override/tests/test_default.py b/roles/jira_download/molecule/version_override/tests/test_default.py index f5e2fc8..1b81145 100644 --- a/roles/jira_download/molecule/version_override/tests/test_default.py +++ b/roles/jira_download/molecule/version_override/tests/test_default.py @@ -19,7 +19,7 @@ def test_version_is_latest(host): assert verfile.content.decode("UTF-8").strip() == "7.13.2" def test_latest_is_downloaded(host): - installer = host.file('/opt/atlassian/tmp/jira-software.7.13.2.bin') + installer = host.file('/opt/atlassian/tmp/jira-software.7.13.2.tar.gz') assert installer.exists assert installer.user == 'root' assert installer.mode == 0o0755