Merged in DCD-1205-dependency-vulnerabilities (pull request #124)

DCD-1205: Dependency vulnerabilities

Approved-by: Ben Partridge
Approved-by: Adam Brokes

Pipfile

@@ -4,16 +4,17 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-ansible = "==2.8.5"
+ansible = "==2.10.5"
-boto3 = "==1.9.242"
+boto3 = "==1.16.56"
-botocore = "==1.12.242"
+botocore = "==1.19.57"
 
 [dev-packages]
 molecule = "==3.2.2"
-docker = "==4.1.0"
+molecule-docker = "==0.2.4"
-six = "*"
+docker = "==4.4.1"
 taskcat = "*"
-Jinja2 = "*"
+pytest = "*"
+testinfra = "*"
 
 [requires]
 python_version = "3.7"

bitbucket-pipelines.yml

@@ -19,8 +19,9 @@ pipelines:
         name: Pre Parallelization stage
         script:
           - echo "Running tests in 38 batches"
+
     - step:
-        name: Check if number of batches match actual number of scenarios
+        name: Check if the template is up-to-date
         script:
           - |
               actual_scenario_count=$(find ./roles -type f -name "molecule.yml" -exec dirname {} ';' | wc -l |  sed -e 's/^[[:space:]]*//')
@@ -30,309 +31,310 @@ pipelines:
                   echo "Mismatch between expected and actual number [${actual_scenario_count}] of scenarios. Please look at https://bitbucket.org/atlassian/dc-deployments-automation/src/master/DEVELOPMENT.md for instructions on how to fix this error."
                   exit $GREP_RETURN_CODE
               fi
+
     - parallel:
        - step:
-           name: Molecule Test Batch - 1
+           name: aws_common/cw-disabled
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 1
+             - cd roles/aws_common
-           
+             - pipenv run molecule test -s cw-disabled
        - step:
-           name: Molecule Test Batch - 2
+           name: aws_common/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 2
+             - cd roles/aws_common
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 3
+           name: aws_common/logs-disabled
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 3
+             - cd roles/aws_common
-           
+             - pipenv run molecule test -s logs-disabled
        - step:
-           name: Molecule Test Batch - 4
+           name: bitbucket_config/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 4
+             - cd roles/bitbucket_config
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 5
+           name: confluence_config/aurora
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 5
+             - cd roles/confluence_config
-           
+             - pipenv run molecule test -s aurora
        - step:
-           name: Molecule Test Batch - 6
+           name: confluence_config/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 6
+             - cd roles/confluence_config
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 7
+           name: confluence_config/password_char_escaping
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 7
+             - cd roles/confluence_config
-           
+             - pipenv run molecule test -s password_char_escaping
        - step:
-           name: Molecule Test Batch - 8
+           name: confluence_config/system_jdk
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 8
+             - cd roles/confluence_config
-           
+             - pipenv run molecule test -s system_jdk
        - step:
-           name: Molecule Test Batch - 9
+           name: create_backups/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 9
+             - cd roles/create_backups
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 10
+           name: diy_backup/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 10
+             - cd roles/diy_backup
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 11
+           name: jira_config/aurora
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 11
+             - cd roles/jira_config
-           
+             - pipenv run molecule test -s aurora
        - step:
-           name: Molecule Test Batch - 12
+           name: jira_config/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 12
+             - cd roles/jira_config
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 13
+           name: jira_config/jira_config_props
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 13
+             - cd roles/jira_config
-           
+             - pipenv run molecule test -s jira_config_props
        - step:
-           name: Molecule Test Batch - 14
+           name: jira_config/password_char_escaping
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 14
+             - cd roles/jira_config
-           
+             - pipenv run molecule test -s password_char_escaping
        - step:
-           name: Molecule Test Batch - 15
+           name: linux_common/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 15
+             - cd roles/linux_common
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 16
+           name: product_common/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 16
+             - cd roles/product_common
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 17
+           name: product_common/system_jdk
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 17
+             - cd roles/product_common
-           
+             - pipenv run molecule test -s system_jdk
        - step:
-           name: Molecule Test Batch - 18
+           name: product_install/bitbucket_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 18
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s bitbucket_latest
        - step:
-           name: Molecule Test Batch - 19
+           name: product_install/confluence_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 19
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s confluence_latest
        - step:
-           name: Molecule Test Batch - 20
+           name: product_install/crowd_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 20
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s crowd_latest
        - step:
-           name: Molecule Test Batch - 21
+           name: product_install/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 21
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 22
+           name: product_install/jira_all
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 22
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_all
        - step:
-           name: Molecule Test Batch - 23
+           name: product_install/jira_cached_with_downgrade
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 23
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_cached_with_downgrade
        - step:
-           name: Molecule Test Batch - 24
+           name: product_install/jira_cached_with_upgrade
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 24
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_cached_with_upgrade
        - step:
-           name: Molecule Test Batch - 25
+           name: product_install/jira_software_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 25
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_software_latest
        - step:
-           name: Molecule Test Batch - 26
+           name: product_install/jira_tarball
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 26
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_tarball
        - step:
-           name: Molecule Test Batch - 27
+           name: product_install/jira_version_from_file
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 27
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_version_from_file
        - step:
-           name: Molecule Test Batch - 28
+           name: product_install/jira_version_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 28
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_version_latest
        - step:
-           name: Molecule Test Batch - 29
+           name: product_install/jira_version_override
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 29
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s jira_version_override
        - step:
-           name: Molecule Test Batch - 30
+           name: product_install/servicedesk3
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 30
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s servicedesk3
        - step:
-           name: Molecule Test Batch - 31
+           name: product_install/servicedesk4
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 31
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s servicedesk4
        - step:
-           name: Molecule Test Batch - 32
+           name: product_install/servicedesk_latest
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 32
+             - cd roles/product_install
-           
+             - pipenv run molecule test -s servicedesk_latest
        - step:
-           name: Molecule Test Batch - 33
+           name: product_startup/bitbucket
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 33
+             - cd roles/product_startup
-           
+             - pipenv run molecule test -s bitbucket
        - step:
-           name: Molecule Test Batch - 34
+           name: product_startup/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 34
+             - cd roles/product_startup
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 35
+           name: product_startup/synchrony
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 35
+             - cd roles/product_startup
-           
+             - pipenv run molecule test -s synchrony
        - step:
-           name: Molecule Test Batch - 36
+           name: restore_backups/default
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 36
+             - cd roles/restore_backups
-           
+             - pipenv run molecule test -s default
        - step:
-           name: Molecule Test Batch - 37
+           name: restore_backups/restore_conf_server
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 37
+             - cd roles/restore_backups
-           
+             - pipenv run molecule test -s restore_conf_server
        - step:
-           name: Molecule Test Batch - 38
+           name: restore_backups/restore_jira_clustered
            services:
              - docker
            script:
-           - apt-get update && ./bin/install-ansible --dev
+             - ./bin/install-ansible --dev
-           - ./bin/run-tests-in-batches --batch 38
+             - cd roles/restore_backups
-           
+             - pipenv run molecule test -s restore_jira_clustered
        

pipeline_generator/pipeline.py

@@ -6,57 +6,25 @@ PIPELINE_TEMPLATE_J2_FILE = 'templates/bitbucket-pipelines.yml.j2'
 ROLES_DIR = 'roles/'
 
 
-class Pipeline:
+def find_all_scenarios():
-    def generate_pipeline(self):
+    scenario_dirs = []
-        template_string = self._load_template_as_string()
+    for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))):
-        template = Template(template_string)
+        [scenario_dirs.append(Path(root)) for f in files if f.endswith("molecule.yml")]
-        steps = self._build_steps()
+    return scenario_dirs
-        generated_output = template.render(parallel_steps=steps)
-        print(generated_output)
-
-    def _build_steps(self):
-        return [Step(f"Molecule Test Batch - {index}",
-                     self._build_script_commands(index))
-                for index, scenario_rel_path in
-                enumerate(self._find_all_scenarios(), 1)]
-
-    @staticmethod
-    def _build_script_commands(index):
-        return ScriptCommand(f"./bin/run-tests-in-batches --batch {index}").all_commands()
-
-    @staticmethod
-    def _find_all_scenarios():
-        scenario_dirs = []
-        for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))):
-            [scenario_dirs.append(root) for f in files if f.endswith("molecule.yml")]
-        return scenario_dirs
-
-    @staticmethod
-    def _load_template_as_string():
-        path = Path(os.path.join(os.path.dirname(__file__), PIPELINE_TEMPLATE_J2_FILE))
-        return path.read_text()
 
 
-class Step:
+def load_template():
-    def __init__(self, name, script_commands=None):
+    path = Path(os.path.join(os.path.dirname(__file__), PIPELINE_TEMPLATE_J2_FILE))
-        if script_commands is None:
+    return Template(path.read_text())
-            script_commands = []
-        self.name = name
-        self.scriptCommands = script_commands
-
-
-class ScriptCommand:
-    PACKAGE_INSTALL_COMMAND = "apt-get update && ./bin/install-ansible --dev"
-
-    def __init__(self, test_command):
-        self.test_command = test_command
-
-    def all_commands(self):
-        return [self.PACKAGE_INSTALL_COMMAND, self.test_command]
 
 
 def main():
-    Pipeline().generate_pipeline()
+    template = load_template()
+
+    scenario_paths = find_all_scenarios()
+    generated_output = template.render(scenario_paths=scenario_paths)
+
+    print(generated_output)
 
 
 if __name__ == '__main__':

pipeline_generator/templates/bitbucket-pipelines.yml.j2

@@ -18,9 +18,10 @@ pipelines:
     - step:
         name: Pre Parallelization stage
         script:
-          - echo "Running tests in {{ parallel_steps|length }} batches"
+          - echo "Running tests in {{ scenario_paths|length }} batches"
+
     - step:
-        name: Check if number of batches match actual number of scenarios
+        name: Check if the template is up-to-date
         script:
           - |
               actual_scenario_count=$(find ./roles -type f -name "molecule.yml" -exec dirname {} ';' | wc -l |  sed -e 's/^[[:space:]]*//')
@@ -30,14 +31,15 @@ pipelines:
                   echo "Mismatch between expected and actual number [${actual_scenario_count}] of scenarios. Please look at https://bitbucket.org/atlassian/dc-deployments-automation/src/master/DEVELOPMENT.md for instructions on how to fix this error."
                   exit $GREP_RETURN_CODE
               fi
+
     - parallel:
-       {% for parallel_step in parallel_steps -%}
+       {% for spath in scenario_paths -%}
         - step:
-           name: {{ parallel_step.name }}
+           name: {{ spath.parts[2] }}/{{ spath.parts[4] }}
            services:
              - docker
            script:
-           {% for scriptCommand in parallel_step.scriptCommands -%}
+             - ./bin/install-ansible --dev
-              - {{ scriptCommand }}
+             - cd roles/{{ spath.parts[2] }}
-           {% endfor %}
+             - pipenv run molecule test -s {{ spath.parts[4] }}
        {% endfor %}

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_config/molecule/default/molecule.yml

@@ -3,11 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-data:
-      line-length: disable
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
@@ -25,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/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/molecule/default/molecule.yml

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

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/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/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/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/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_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