From a0080b5b079c511f4fb2ac34c2900e2a5395ed87 Mon Sep 17 00:00:00 2001
From: Brett Meehan <bmeehan@atlassian.com>
Date: Fri, 15 Nov 2019 12:15:32 +1100
Subject: [PATCH] ITOPSENG-101 fixed version in version_from_file and added
 better obr unpacking

---
 .../jira_version_from_file/tests/test_default.py     |  4 ++--
 .../tasks/jira-servicedesk_as_obr.yml                | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/roles/product_install/molecule/jira_version_from_file/tests/test_default.py b/roles/product_install/molecule/jira_version_from_file/tests/test_default.py
index 07098b7..1b725b8 100644
--- a/roles/product_install/molecule/jira_version_from_file/tests/test_default.py
+++ b/roles/product_install/molecule/jira_version_from_file/tests/test_default.py
@@ -14,12 +14,12 @@ def test_version_is_correct(host):
     assert verfile.content.decode("UTF-8").strip() == "7.13.1"
 
 def test_is_downloaded(host):
-    installer = host.file('/media/atl/downloads/jira-core.7.13.1-x64.bin')
+    installer = host.file('/media/atl/downloads/jira-core.7.9.0-x64.bin')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_completed_lockfile(host):
-    lockfile = host.file('/media/atl/downloads/jira-core.7.13.1-x64.bin_completed')
+    lockfile = host.file('/media/atl/downloads/jira-core.7.9.0-x64.bin_completed')
     assert lockfile.exists
     assert lockfile.user == 'root'
 
diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
index ce940cb..e236f44 100644
--- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml
+++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
@@ -163,10 +163,16 @@
     src: "{{ atl_obr_download }}"
     dest: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins"
     creates: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins/jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.jar"
-    extra_opts:
-      - -j
-      - -n
+    list_files: no
+    exclude:
+      - M*
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"
     mode: 0750
   ignore_errors: yes
+
+- name: Move JSD dependency jars into the installed-plugins dir
+  shell:
+    cmd: "mv {{ atl_product_version_cache_dir }}/plugins/installed-plugins/dependencies/*.jar {{ atl_product_version_cache_dir }}/plugins/installed-plugins"
+    creates: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins/servicedesk-core-ui-plugin-{{ atl_jsd_build_info.json.name }}-REL-0022.jar"
+