Merge branch 'master' into ITPLAT-387-dcd---update-systemd-servic

roles/product_install/defaults/main.yml

@@ -36,6 +36,7 @@ atl_servicedesk_url_map:
   default: "{{ atl_servicedesk_versioned_url }}"
 atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | default(atl_servicedesk_url_map['default']) }}"
 
+atl_install_jsd_as_obr: false
 atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr"
 
 force_version_update: false

roles/product_install/molecule/bitbucket_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,13 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/confluence_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,13 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/crowd_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,13 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,8 +16,6 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -27,6 +23,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/default/tests/test_default.py

@@ -34,4 +34,8 @@ def test_completed_lockfile(host):
 
     lockfile = host.file('/media/atl/downloads/jira-core.'+upstream+'-x64.bin_completed')
     assert lockfile.exists
-    assert lockfile.user == 'root'
+    assert lockfile.user == 'root'
+
+def test_servicedesk_not_installed(host):
+    plugins = host.file('/media/atl/jira/shared/plugins/installed-plugins')
+    assert (not plugins.exists) or (len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0)

roles/product_install/molecule/jira_all/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,13 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -19,8 +17,6 @@ provisioner:
   options:
     vvv: true
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -28,6 +24,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -19,8 +17,6 @@ provisioner:
   options:
     vvv: true
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -28,6 +24,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_software_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,13 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_tarball/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,8 +16,6 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -27,6 +23,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_version_from_file/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,8 +16,6 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -27,6 +23,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_version_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,8 +16,6 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -27,6 +23,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/jira_version_override/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,8 +16,6 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
@@ -27,6 +23,3 @@ verifier:
   name: testinfra
   additional_files_or_dirs:
     - ../../resources/tests/test_*.py
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/servicedesk3/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -19,13 +17,8 @@ provisioner:
   options:
     vv: true
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/servicedesk4/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -19,13 +17,8 @@ provisioner:
   options:
     vv: true
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/molecule/servicedesk_latest/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -19,13 +17,8 @@ provisioner:
   options:
     vv: true
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_install/tasks/main.yml

@@ -277,6 +277,4 @@
 
 - name: Include if jsd is requested to be installed from OBR
   include_tasks: "jira-servicedesk_as_obr.yml"
-  when:
-    - atl_install_jsd_as_obr is defined
-    - atl_install_jsd_as_obr
+  when: atl_install_jsd_as_obr