From 4bacc33c5a9831f81f2c7f1514156399ca309269 Mon Sep 17 00:00:00 2001
From: Adam Brokes <abrokes@atlassian.com>
Date: Fri, 12 Feb 2021 13:44:46 +1100
Subject: [PATCH] DCD-1216: Change the url to fetch Jira buildNumber for OBR
 compatability

---
 .../product_install/molecule/jira_all/converge.yml |  6 ++++--
 .../molecule/jira_all/tests/test_default.py        | 14 +++++++-------
 .../tasks/jira-servicedesk_as_obr.yml              |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/roles/product_install/molecule/jira_all/converge.yml b/roles/product_install/molecule/jira_all/converge.yml
index 9bddc9a..7dd8f2d 100644
--- a/roles/product_install/molecule/jira_all/converge.yml
+++ b/roles/product_install/molecule/jira_all/converge.yml
@@ -5,7 +5,9 @@
     atl_product_family: "jira"
     atl_product_edition: "jira-software"
     atl_product_user: "jira"
-    atl_product_version: "7.13.1"
+    # Version 8.14.0 is chosen deliberately as it is a version where jira and jira-software returns different buildNumber from MPAC
+    # See DCD-1216 for context
+    atl_product_version: "8.14.0" 
     atl_install_jsd_as_obr: true
     atl_systemd_service_name: "jira.service"
     atl_jdbc_encoding: 'UNICODE'
@@ -20,7 +22,7 @@
     - name: Seed version
       copy:
         dest: '/media/atl/jira/shared/jira-core.version'
-        content: "7.13.1"
+        content: "8.14.0"
         force: false  # For idempotency check
   roles:
     - role: linux_common
diff --git a/roles/product_install/molecule/jira_all/tests/test_default.py b/roles/product_install/molecule/jira_all/tests/test_default.py
index b9522ec..cca4380 100644
--- a/roles/product_install/molecule/jira_all/tests/test_default.py
+++ b/roles/product_install/molecule/jira_all/tests/test_default.py
@@ -12,37 +12,37 @@ def test_version_is_correct(host):
     verfile = host.file('/media/atl/jira/shared/jira-software.version')
     assert verfile.exists
 
-    assert verfile.content.decode("UTF-8").strip() == "7.13.1"
+    assert verfile.content.decode("UTF-8").strip() == "8.14.0"
 
 def test_is_downloaded(host):
-    installer = host.file('/media/atl/downloads/jira-software.7.13.1-x64.bin')
+    installer = host.file('/media/atl/downloads/jira-software.8.14.0-x64.bin')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_completed_lockfile(host):
-    lockfile = host.file('/media/atl/downloads/jira-software.7.13.1-x64.bin_completed')
+    lockfile = host.file('/media/atl/downloads/jira-software.8.14.0-x64.bin_completed')
     assert lockfile.exists
     assert lockfile.user == 'root'
 
 def test_is_unpacked(host):
-    installer = host.file('/opt/atlassian/jira-software/7.13.1/atlassian-jira/')
+    installer = host.file('/opt/atlassian/jira-software/8.14.0/atlassian-jira/')
     assert installer.exists
     assert installer.is_directory
     assert installer.user == 'jira'
     assert installer.mode == 0o0755
 
 def test_obr_is_downloaded(host):
-    installer = host.file('/media/atl/downloads/jira-servicedesk-application-3.16.1.obr')
+    installer = host.file('/media/atl/downloads/jira-servicedesk-application-4.14.0.obr')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_obr_completed_lockfile(host):
-    lockfile = host.file('/media/atl/downloads/jira-servicedesk-application-3.16.1.obr_completed')
+    lockfile = host.file('/media/atl/downloads/jira-servicedesk-application-4.14.0.obr_completed')
     assert lockfile.exists
     assert lockfile.user == 'root'
 
 def test_obr_is_unpacked(host):
-    jsdjar = host.file('/media/atl/jira/shared/plugins/installed-plugins/jira-servicedesk-application-3.16.1.jar')
+    jsdjar = host.file('/media/atl/jira/shared/plugins/installed-plugins/jira-servicedesk-application-4.14.0.jar')
     assert jsdjar.exists
     assert jsdjar.user == 'jira'
     assert jsdjar.mode == 0o0750
\ No newline at end of file
diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
index f942c18..3905a44 100644
--- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml
+++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
@@ -2,7 +2,7 @@
 
 - name: Get the installer product version info
   uri:
-    url: "{{ atl_mpac_products }}/key/jira-software/versions/name/{{ atl_product_version }}"
+    url: "{{ atl_mpac_products }}/key/jira/versions/name/{{ atl_product_version }}"
     return_content: yes
   register: atl_product_version_info