From 4d7201fd072f2fcc19e485ff6575c8a4fbd41bc0 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Mon, 29 Apr 2019 13:51:42 +1000
Subject: [PATCH] DCD-224: Update servicedesk test to check bundle mappings.

---
 .../Dockerfile.j2                             |  0
 .../molecule.yml                              |  0
 .../molecule/servicedesk/playbook.yml         | 19 +++++++++++++++++++
 .../tests/test_default.py                     |  8 ++++----
 .../servicedesk_version_override/playbook.yml | 12 ------------
 5 files changed, 23 insertions(+), 16 deletions(-)
 rename roles/product_download/molecule/{servicedesk_version_override => servicedesk}/Dockerfile.j2 (100%)
 rename roles/product_download/molecule/{servicedesk_version_override => servicedesk}/molecule.yml (100%)
 create mode 100644 roles/product_download/molecule/servicedesk/playbook.yml
 rename roles/product_download/molecule/{servicedesk_version_override => servicedesk}/tests/test_default.py (65%)
 delete mode 100644 roles/product_download/molecule/servicedesk_version_override/playbook.yml

diff --git a/roles/product_download/molecule/servicedesk_version_override/Dockerfile.j2 b/roles/product_download/molecule/servicedesk/Dockerfile.j2
similarity index 100%
rename from roles/product_download/molecule/servicedesk_version_override/Dockerfile.j2
rename to roles/product_download/molecule/servicedesk/Dockerfile.j2
diff --git a/roles/product_download/molecule/servicedesk_version_override/molecule.yml b/roles/product_download/molecule/servicedesk/molecule.yml
similarity index 100%
rename from roles/product_download/molecule/servicedesk_version_override/molecule.yml
rename to roles/product_download/molecule/servicedesk/molecule.yml
diff --git a/roles/product_download/molecule/servicedesk/playbook.yml b/roles/product_download/molecule/servicedesk/playbook.yml
new file mode 100644
index 0000000..9b52a39
--- /dev/null
+++ b/roles/product_download/molecule/servicedesk/playbook.yml
@@ -0,0 +1,19 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    atl_product_bundle: servicedesk
+    bundle_map:
+      all: software
+      servicedesk: software
+      core: core
+      software: software
+
+    atl_product_edition: "jira-{{ bundle_map[atl_product_bundle] }}"
+    atl_product_family: "jira"
+    atl_product_user: "jira"
+
+  roles:
+    - role: linux_common
+    - role: product_common
+    - role: product_download
diff --git a/roles/product_download/molecule/servicedesk_version_override/tests/test_default.py b/roles/product_download/molecule/servicedesk/tests/test_default.py
similarity index 65%
rename from roles/product_download/molecule/servicedesk_version_override/tests/test_default.py
rename to roles/product_download/molecule/servicedesk/tests/test_default.py
index 705d936..fdcf557 100644
--- a/roles/product_download/molecule/servicedesk_version_override/tests/test_default.py
+++ b/roles/product_download/molecule/servicedesk/tests/test_default.py
@@ -8,18 +8,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_is_correct(host):
-    verfile = host.file('/media/atl/jira/shared/servicedesk.version')
+    verfile = host.file('/media/atl/jira/shared/jira-software.version')
     assert verfile.exists
 
-    assert verfile.content.decode("UTF-8").strip() == "3.16.3"
+    assert verfile.content.decode("UTF-8").strip() == "8.1.0"
 
 def test_is_downloaded(host):
-    installer = host.file('/opt/atlassian/tmp/servicedesk.3.16.3.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/jira-software.8.1.0.tar.gz')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_is_unpacked(host):
-    installer = host.file('/opt/atlassian/servicedesk/3.16.3')
+    installer = host.file('/opt/atlassian/jira-software/8.1.0')
     assert installer.exists
     assert installer.is_directory
     assert installer.user == 'jira'
diff --git a/roles/product_download/molecule/servicedesk_version_override/playbook.yml b/roles/product_download/molecule/servicedesk_version_override/playbook.yml
deleted file mode 100644
index 7248f1a..0000000
--- a/roles/product_download/molecule/servicedesk_version_override/playbook.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Converge
-  hosts: all
-  vars:
-    atl_product_family: "jira"
-    atl_product_edition: "servicedesk"
-    atl_product_user: "jira"
-    atl_product_version: "3.16.3"
-  roles:
-    - role: linux_common
-    - role: product_common
-    - role: product_download