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

roles/aws_common/molecule/cw-disabled/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -14,15 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-    options:
-      x: ["303", "602"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/aws_common/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -14,15 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-    options:
-      x: ["303", "602"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/aws_common/molecule/logs-disabled/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -14,15 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-    options:
-      x: ["303", "602"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/bitbucket_common/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
 
-atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}"
 atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}"
+

roles/bitbucket_config/default/main.yaml

@@ -1 +0,0 @@
----

roles/bitbucket_config/defaults/main.yaml

@@ -0,0 +1,5 @@
+---
+
+atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_properties_raw: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}"
+atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('equalto', '') | list }}"

roles/bitbucket_config/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - bitbucket_common

roles/bitbucket_config/molecule/default/converge.yml

@@ -12,6 +12,8 @@
     atl_jdbc_user: 'bb_db_user'
     atl_jdbc_password: 'molecule_password'
 
+    atl_bitbucket_properties_raw: "key1=val1 key2=val2    key3=val3"
+
   roles:
     - role: linux_common
     - role: product_common

roles/bitbucket_config/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

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

@@ -14,3 +14,7 @@ def test_config_file(host):
     assert f.contains("jdbc.driver=org.postgresql.Driver")
     assert f.contains("jdbc.user=bb_db_user")
     assert f.contains("jdbc.password=molecule_password")
+
+    assert f.contains("^key1=val1$")
+    assert f.contains("^key2=val2$")
+    assert f.contains("^key3=val3$")

roles/bitbucket_config/templates/bitbucket.properties.j2

@@ -1,4 +1,4 @@
-# Created by Ansible
+# Created by Ansible role `bitbucket_config`
 jdbc.driver={{ atl_db_driver }}
 jdbc.url={{ atl_jdbc_url }}
 jdbc.user={{ atl_jdbc_user }}
@@ -34,3 +34,6 @@ server.scheme=http
 server.proxy-port=80
 {% endif %}
 
+{% for prop in atl_bitbucket_properties %}
+{{ prop }}
+{% endfor %}

roles/bitbucket_dataset_restore/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+
+atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}"

roles/bitbucket_dataset_restore/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - bitbucket_common

roles/confluence_config/molecule/aurora/molecule.yml

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

roles/confluence_config/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,15 +16,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/confluence_config/molecule/password_char_escaping/molecule.yml

@@ -3,8 +3,7 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -18,15 +17,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/confluence_config/molecule/system_jdk/molecule.yml

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

roles/create_backups/.yamllint

@@ -1,33 +0,0 @@
----
-# Based on ansible-lint config
-extends: default
-
-rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  colons:
-    max-spaces-after: -1
-    level: error
-  commas:
-    max-spaces-after: -1
-    level: error
-  comments: disable
-  comments-indentation: disable
-  document-start: disable
-  empty-lines:
-    max: 3
-    level: error
-  hyphens:
-    level: error
-  indentation: disable
-  key-duplicates: enable
-  line-length: disable
-  new-line-at-end-of-file: disable
-  new-lines:
-    type: unix
-  trailing-spaces: disable
-  truthy: disable

roles/create_backups/defaults/main.yml

@@ -1,11 +0,0 @@
----
-
-atl_db_port: 5432
-atl_systemd_service_name: "{{ atl_product_family }}.service"
-
-atl_slingshot_yum_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-rpm'
-atl_amazon_extras_postgresql_version: '9.6'
-
-atl_slingshot_deb_pubkey_url: 'https://packages.atlassian.com/api/gpg/key/public'
-atl_slingshot_deb_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-deb'
-atl_slingshot_deb_repo_components: 'stable main'

roles/create_backups/molecule/default/Dockerfile.j2

@@ -1,22 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-{% if item.env is defined %}
-{% for var, value in item.env.items() %}
-{% if value %}
-ENV {{ var }} {{ value }}
-{% endif %}
-{% endfor %}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash iproute && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml iproute2 && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi

roles/create_backups/molecule/default/INSTALL.rst

@@ -1,22 +0,0 @@
-*******
-Docker driver installation guide
-*******
-
-Requirements
-============
-
-* Docker Engine
-
-Install
-=======
-
-Please refer to the `Virtual environment`_ documentation for installation best
-practices. If not using a virtual environment, please consider passing the
-widely recommended `'--user' flag`_ when invoking ``pip``.
-
-.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
-.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
-
-.. code-block:: bash
-
-    $ pip install 'molecule[docker]'

roles/create_backups/molecule/default/molecule.yml

@@ -1,37 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint:
-  name: yamllint
-platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-#
-# Temporarily (1st April 2020) removing ubuntu as a test platform.
-# The atlassian-slingshot debian (Ubuntu) repository is at present
-# malformed and is currently missing its 'Release' file. As a result
-# when this test executes and tries to pull the `ubuntu_lts` archive
-# (see ubuntu.yml task) it fails with the following error:
-#
-# "The repository 'https://packages.atlassian.com/atlassian-slingshot-deb
-# stable Release' does not have a Release file."
-#
-# See: https://bulldog.internal.atlassian.com/browse/DCD-964 which has
-# been raised to resolve this issue and fix the Ubuntu Slingshot
-# distribution
-#
-# TODO: Activate the config below (un-comment) once the issue described above
-# has been resolved.
-#
-#  - name: ubuntu_lts
-#    image: ubuntu:bionic
-provisioner:
-  name: ansible
-  lint:
-    name: ansible-lint
-verifier:
-  name: testinfra
-  lint:
-    name: flake8

roles/create_backups/molecule/default/playbook.yml

@@ -1,11 +0,0 @@
----
-- name: Converge
-  hosts: all
-  tasks:
-    # Role default vars must be included because we aren't running the whole role, just a subset of tasks
-    - name: Include role vars
-      include_vars:
-        file: ../../defaults/main.yml
-
-    - name: Install distro-specific backup support packages
-      include_tasks: "../../tasks/{{ ansible_distribution|lower }}.yml"

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

@@ -1,11 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_slingshot_installed(host):
-    assert host.file('/usr/bin/atlassian-slingshot').exists
-    assert host.file('/usr/bin/psql').exists

roles/create_backups/tasks/amazon.yml

@@ -1,21 +0,0 @@
----
-
-- name: Add atlassian-slingshot yum repository
-  yum_repository:
-    name: AtlassianSlingshot
-    file: atlassian-slingshot
-    state: present
-    description: Atlassian Slingshot
-    baseurl: "{{ atl_slingshot_yum_repo_url }}"
-    gpgcheck: no
-
-- name: Install atlassian-slingshot
-  yum:
-    name: atlassian-slingshot
-
-- name: Enable Postgresql from 'extras'
-  command: amazon-linux-extras install -y "postgresql{{ atl_amazon_extras_postgresql_version }}"
-  args:
-    creates: /usr/bin/psql
-  environment:
-    PYTHON: /bin/python

roles/create_backups/tasks/main.yml

@@ -1,39 +0,0 @@
----
-
-- name: Install distro-specific backup support packages
-  include_tasks: "{{ ansible_distribution|lower }}.yml"
-
-- name: Stop the {{ atl_product_family }} service
-  service:
-    name: "{{ atl_systemd_service_name }}"
-    state: stopped
-
-- name: Run the slingshot backup
-  command:
-    argv:
-      - "atlassian-slingshot"
-      - "backup"
-      - "--backupDir"
-      - "{{ atl_slingshot_backup_dir }}"
-      - "--dbHost"
-      - "{{ atl_db_host }}"
-      - "--dbPort"
-      - "{{ atl_db_port }}"
-      - "--dbUser"
-      - "{{ atl_jdbc_user }}"
-      - "--dbName"
-      - "{{ atl_jdbc_db_name }}"
-      - "--s3BucketName"
-      - "{{ atl_s3_backup_bucket }}"
-      - "--awsRegion"
-      - "{{ atl_s3_backup_region }}"
-      - "--sharedHomeLocation"
-      - "{{ atl_product_home_shared }}"
-      - "--isAutomation"
-  environment:
-    ATL_DB_PASSWORD: "{{ atl_jdbc_password }}"
-
-- name: Restart the {{ atl_product_family }} service
-  service:
-    name: "{{ atl_systemd_service_name }}"
-    state: restarted

roles/create_backups/tasks/ubuntu.yml

@@ -1,27 +0,0 @@
----
-- name: Install gnupg
-  apt:
-    name: gnupg
-    state: present
-
-- name: Add atlassian-slingshot debian repo public key
-  apt_key:
-    url: "{{ atl_slingshot_deb_pubkey_url }}"
-    state: present
-
-- name: Add atlassian-slingshot debian repository
-  apt_repository:
-    repo: "deb {{ atl_slingshot_deb_repo_url }} {{ atl_slingshot_deb_repo_components }}"
-    state: present
-    filename: atlassian-slingshot
-
-- name: Install atlassian-slingshot
-  apt:
-    name: atlassian-slingshot
-    update_cache: yes
-    state: present
-
-- name: Install postgresql
-  apt:
-    name: postgresql
-    state: present

roles/diy_backup/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/jira_config/molecule/aurora/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/jira_config/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/jira_config/molecule/jira_config_props/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/jira_config/molecule/password_char_escaping/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/linux_common/files/java.conf

@@ -0,0 +1,3 @@
+# Exclude java-hooks
+x /tmp/hsperfdata_*
+x /tmp/.java_pid*

roles/linux_common/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -16,12 +14,8 @@ platforms:
       - aws_node_local
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8

roles/linux_common/tasks/main.yml

@@ -26,3 +26,19 @@
     uid: "{{ atl_product_user_uid }}"
     group: "{{ atl_product_user }}"
     comment: "Product runtime user"
+
+- name: Stop systemd-cleanup deleting the jvm socket file
+  copy:
+    src: java.conf
+    dest: "/usr/lib/tmpfiles.d/java.conf"
+    owner: root
+    group: root
+    mode: "644"
+  register: systemd_config_changed
+
+- name: Force systemd to reload daemon configuration
+  systemd:
+    daemon_reload: yes
+  when:
+    - systemd_config_changed is defined
+    - molecule_yml is not defined  # molecule cannot run systemctl commands and notest doesn't work for handlers

roles/product_common/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -12,9 +10,5 @@ platforms:
     image: ubuntu:bionic
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
-  lint:
-    name: flake8

roles/product_common/molecule/system_jdk/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -12,9 +10,5 @@ platforms:
     image: ubuntu:bionic
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
-  lint:
-    name: flake8

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

roles/product_startup/molecule/bitbucket/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_startup/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/product_startup/molecule/synchrony/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/restore_backups/molecule/default/molecule.yml

@@ -3,8 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -22,15 +20,8 @@ provisioner:
   name: ansible
   options:
     skip-tags: runtime_pkg
-  lint:
-    name: ansible-lint
-    options:
-      x: ["701"]
   inventory:
     links:
       group_vars: ../../../../group_vars/
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: false

roles/restore_backups/molecule/restore_conf_server/molecule.yml

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

roles/restore_backups/molecule/restore_jira_clustered/molecule.yml

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