blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-13 16:33:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

DCD-484: Save tarballs with the correct suffix.

Browse Source
This commit is contained in:
Steve Smith
2019-07-12 11:40:00 +10:00
parent 4dff688b3d
commit 44daf80d9a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/product_install/defaults/main.yml
View File

@@ -12,12 +12,13 @@ atl_download_format: 'installer'
atl_download_format_suffix_map: atl_download_format_suffix_map:
installer: '-x64.bin' installer: '-x64.bin'
tarball: '.tar.gz' tarball: '.tar.gz'
atl_download_suffix: "{{ atl_download_format_suffix_map[atl_download_format] }}"
atl_release_base_url: "https://product-downloads.atlassian.com/software" atl_release_base_url: "https://product-downloads.atlassian.com/software"
atl_product_base_url: "{{ atl_release_base_url }}/{{ atl_product_family }}/downloads" atl_product_base_url: "{{ atl_release_base_url }}/{{ atl_product_family }}/downloads"
atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}{{ atl_download_format_suffix_map[atl_download_format] }}" atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}{{ atl_download_suffix }}"
atl_product_download_filename: "{{ atl_download_edition | default(atl_product_edition) }}.{{ atl_product_version }}.bin" atl_product_download_filename: "{{ atl_download_edition | default(atl_product_edition) }}.{{ atl_product_version }}{{ atl_download_suffix }}"
atl_product_download: "{{ atl_installer_temp }}/{{ atl_product_download_filename }}" atl_product_download: "{{ atl_installer_temp }}/{{ atl_product_download_filename }}"
atl_product_varfile: "{{ atl_installer_temp }}/{{ atl_product_family }}.varfile" atl_product_varfile: "{{ atl_installer_temp }}/{{ atl_product_family }}.varfile"

2
roles/product_install/molecule/jira_tarball/tests/test_default.py
View File

@@ -23,6 +23,6 @@ def test_latest_is_downloaded(host):
upstream_json = json.load(upstream_fd) upstream_json = json.load(upstream_fd)
upstream = upstream_json['version'] upstream = upstream_json['version']
installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.bin') installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.tar.gz')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'

2
roles/product_install/tasks/unpack_tarball.yml
View File

@@ -8,7 +8,7 @@
owner: "{{ atl_product_user }}" owner: "{{ atl_product_user }}"
group: "{{ atl_product_user }}" group: "{{ atl_product_user }}"
mode: 0755 mode: 0755
# Strip off the lead product/version specific directory to normaise naming # Strip off the lead product/version specific directory to normalise naming
extra_opts: extra_opts:
- "--strip-components=1" - "--strip-components=1"
# NOTE: Currently all products contain a `README.txt`, so use that as an 'unpacked' marker. # NOTE: Currently all products contain a `README.txt`, so use that as an 'unpacked' marker.