diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index 92766b3..074e901 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -7,7 +7,7 @@ atl_cached_version: '' # with values for both password and username atl_download_secret_name: '' -atl_product_latest_version_url: "https://marketplace.atlassian.com/rest/2/products/key/{{ atl_product_family }}/versions" +atl_product_latest_version_url: "https://marketplace-admin.internal.atlassian.com/rest/2/products/key/{{ atl_product_family }}/versions" atl_product_version_cache_dir: "{{ atl_product_home_shared }}" atl_product_version_cache: "{{ atl_product_home_shared }}/{{ atl_product_edition }}.version" @@ -30,10 +30,10 @@ atl_product_home_shared_download: "{{ atl_product_home_shared_download_dir }}/{{ atl_product_home_shared_moving_lock: "{{ atl_product_home_shared_download }}_moving" atl_product_home_shared_completed_lock: "{{ atl_product_home_shared_download }}_completed" -atl_marketplace_base: "https://marketplace.atlassian.com" -atl_mpac_products: "https://marketplace.atlassian.com/rest/2/products" -atl_servicedesk_latest_url: "https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest" -atl_servicedesk_versioned_url: "https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/name/{{ atl_product_version }}" +atl_marketplace_base: "https://marketplace-admin.internal.atlassian.com/" +atl_mpac_products: "https://marketplace-admin.internal.atlassian.com/rest/2/products" +atl_servicedesk_latest_url: "https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest" +atl_servicedesk_versioned_url: "https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-servicedesk/versions/name/{{ atl_product_version }}" atl_servicedesk_url_map: latest: "{{ atl_servicedesk_latest_url }}" default: "{{ atl_servicedesk_versioned_url }}" diff --git a/roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# b/roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# index 0862a21..e302b77 100644 --- a/roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# +++ b/roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# @@ -24,14 +24,14 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/confluence/shared/confluence.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/confluence/versions/latest") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/applications/confluence/versions/latest") upstream_json = json.load(upstream_fd) upstream = upstream_json['version'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/confluence/versions/latest") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/applications/confluence/versions/latest") upstream_json = json.load(upstream_fd) upstream = upstream_json['version'] diff --git a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py index bb5b1d8..123a67d 100644 --- a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py +++ b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py @@ -24,14 +24,14 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/bitbucket/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/bitbucket/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -40,7 +40,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/bitbucket/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] diff --git a/roles/product_install/molecule/confluence_latest/tests/test_default.py b/roles/product_install/molecule/confluence_latest/tests/test_default.py index 1b3ef88..0b3e9eb 100644 --- a/roles/product_install/molecule/confluence_latest/tests/test_default.py +++ b/roles/product_install/molecule/confluence_latest/tests/test_default.py @@ -24,14 +24,14 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/confluence/shared-home/confluence.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/confluence/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/confluence/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -40,7 +40,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/confluence/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] diff --git a/roles/product_install/molecule/crowd_latest/tests/test_default.py b/roles/product_install/molecule/crowd_latest/tests/test_default.py index 34ffcbc..ba1205d 100644 --- a/roles/product_install/molecule/crowd_latest/tests/test_default.py +++ b/roles/product_install/molecule/crowd_latest/tests/test_default.py @@ -24,14 +24,14 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/crowd/shared/crowd.version') assert verfile.exists - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/crowd/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/crowd/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -40,7 +40,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/crowd/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py index d157012..7c6c1e9 100644 --- a/roles/product_install/molecule/default/tests/test_default.py +++ b/roles/product_install/molecule/default/tests/test_default.py @@ -12,14 +12,14 @@ 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://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -28,7 +28,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] 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 653ece1..d65c925 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 @@ -24,14 +24,14 @@ 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://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -40,7 +40,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] diff --git a/roles/product_install/molecule/jira_tarball/tests/test_default.py b/roles/product_install/molecule/jira_tarball/tests/test_default.py index 97e4f58..cda5a8d 100644 --- a/roles/product_install/molecule/jira_tarball/tests/test_default.py +++ b/roles/product_install/molecule/jira_tarball/tests/test_default.py @@ -12,14 +12,14 @@ 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://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -28,7 +28,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] 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 93b81b4..85fd808 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 @@ -12,14 +12,14 @@ 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://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] @@ -28,7 +28,7 @@ def test_latest_is_downloaded(host): assert installer.user == 'root' def test_completed_lockfile(host): - upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions") + upstream_fd = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions") upstream_json = json.load(upstream_fd) upstream = upstream_json['_embedded']['versions'][0]['name'] diff --git a/roles/product_install/molecule/servicedesk_latest/tests/test_default.py b/roles/product_install/molecule/servicedesk_latest/tests/test_default.py index bd4eea8..92b1739 100644 --- a/roles/product_install/molecule/servicedesk_latest/tests/test_default.py +++ b/roles/product_install/molecule/servicedesk_latest/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') def get_latest(): - data = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest") + data = urllib.request.urlopen("https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest") meta = json.loads(data.read().decode("UTF-8")) servicedesk = meta['name'] jira = meta['compatibilities'][0]['hosting']['server']['max']['version'] diff --git a/roles/product_install/tasks/jira-core_version_latest.yml b/roles/product_install/tasks/jira-core_version_latest.yml index 9c423a8..24fa616 100644 --- a/roles/product_install/tasks/jira-core_version_latest.yml +++ b/roles/product_install/tasks/jira-core_version_latest.yml @@ -2,7 +2,7 @@ - name: Fetch the latest version from URL ansible.builtin.set_fact: - atl_product_version_json: "{{ lookup('url', 'https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions') }}" + atl_product_version_json: "{{ lookup('url', 'https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions') }}" - name: Set the local var to retrieved version ansible.builtin.set_fact: diff --git a/roles/product_install/tasks/jira-servicedesk_version_latest.yml b/roles/product_install/tasks/jira-servicedesk_version_latest.yml index 07c9bbd..98e0efa 100644 --- a/roles/product_install/tasks/jira-servicedesk_version_latest.yml +++ b/roles/product_install/tasks/jira-servicedesk_version_latest.yml @@ -2,7 +2,7 @@ - name: Fetch the latest version from URL ansible.builtin.set_fact: - atl_product_version_json: "{{ lookup('url', 'https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions') }}" + atl_product_version_json: "{{ lookup('url', 'https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-servicedesk/versions') }}" - name: Set the local var to retrieved version ansible.builtin.set_fact: diff --git a/roles/product_install/tasks/jira-software_version_latest.yml b/roles/product_install/tasks/jira-software_version_latest.yml index 9c423a8..24fa616 100644 --- a/roles/product_install/tasks/jira-software_version_latest.yml +++ b/roles/product_install/tasks/jira-software_version_latest.yml @@ -2,7 +2,7 @@ - name: Fetch the latest version from URL ansible.builtin.set_fact: - atl_product_version_json: "{{ lookup('url', 'https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions') }}" + atl_product_version_json: "{{ lookup('url', 'https://marketplace-admin.internal.atlassian.com/rest/2/products/key/jira-software/versions') }}" - name: Set the local var to retrieved version ansible.builtin.set_fact: