From 5872eba6c81e91f4f162d865d381050c7316d3d9 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Thu, 11 Jul 2019 10:17:07 +1000 Subject: [PATCH 1/2] The S3 Jira latest file does not appear to be updating, so use marketplace. --- .../molecule/default/tests/test_default.py | 13 ++++++++----- .../jira_software_latest/tests/test_default.py | 12 +++++++----- .../jira_version_latest/tests/test_default.py | 12 +++++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py index 82f1205..18c41a2 100644 --- a/roles/product_install/molecule/default/tests/test_default.py +++ b/roles/product_install/molecule/default/tests/test_default.py @@ -2,6 +2,7 @@ import os from six.moves import urllib import testinfra.utils.ansible_runner +import json testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') @@ -11,14 +12,16 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/jira/shared/jira-core.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest") - upstream = upstream_fd.read() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] - assert verfile.content.decode("UTF-8").strip() == upstream.decode("UTF-8").strip() + assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest") - upstream = upstream_fd.read().decode("UTF-8").strip() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.bin') assert installer.exists diff --git a/roles/product_install/molecule/jira_software_latest/tests/test_default.py b/roles/product_install/molecule/jira_software_latest/tests/test_default.py index 05e48cb..df69114 100644 --- a/roles/product_install/molecule/jira_software_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_software_latest/tests/test_default.py @@ -23,14 +23,16 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/jira/shared/jira-software.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest") - upstream = upstream_fd.read() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] - assert verfile.content.decode("UTF-8").strip() == upstream.decode("UTF-8").strip() + assert verfile.content.decode("UTF-8").strip() == upstream.strip() 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() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] installer = host.file('/opt/atlassian/tmp/jira-software.'+upstream+'.bin') assert installer.exists diff --git a/roles/product_install/molecule/jira_version_latest/tests/test_default.py b/roles/product_install/molecule/jira_version_latest/tests/test_default.py index 82f1205..e66a346 100644 --- a/roles/product_install/molecule/jira_version_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_version_latest/tests/test_default.py @@ -11,14 +11,16 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/jira/shared/jira-core.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest") - upstream = upstream_fd.read() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] - assert verfile.content.decode("UTF-8").strip() == upstream.decode("UTF-8").strip() + assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest") - upstream = upstream_fd.read().decode("UTF-8").strip() + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/jira/versions/latest") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['version'] installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.bin') assert installer.exists From 05a8b1b3fa95bf6fc4f72de5fa801bc787f7f024 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Thu, 11 Jul 2019 11:27:23 +1000 Subject: [PATCH 2/2] Add some missing imports. --- .../molecule/jira_software_latest/tests/test_default.py | 1 + .../molecule/jira_version_latest/tests/test_default.py | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/product_install/molecule/jira_software_latest/tests/test_default.py b/roles/product_install/molecule/jira_software_latest/tests/test_default.py index df69114..ff6fa8b 100644 --- a/roles/product_install/molecule/jira_software_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_software_latest/tests/test_default.py @@ -2,6 +2,7 @@ import os from six.moves import urllib import testinfra.utils.ansible_runner +import json testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') diff --git a/roles/product_install/molecule/jira_version_latest/tests/test_default.py b/roles/product_install/molecule/jira_version_latest/tests/test_default.py index e66a346..18c41a2 100644 --- a/roles/product_install/molecule/jira_version_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_version_latest/tests/test_default.py @@ -2,6 +2,7 @@ import os from six.moves import urllib import testinfra.utils.ansible_runner +import json testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')