From 68f364462652d0dbfa9664edd1be2f670e9a4b15 Mon Sep 17 00:00:00 2001
From: xbinois <xbinois@harlequin.rp.u-bourgogne.fr>
Date: Tue, 25 Feb 2020 11:29:59 +0100
Subject: [PATCH] Update molecule configuration to work with 3.0.

---
 .travis.yml                                   |  3 +--
 molecule/default/yaml-lint.yml => .yamllint   |  2 +-
 molecule/default/Dockerfile.j2                | 14 ------------
 molecule/default/INSTALL.rst                  | 22 -------------------
 .../{debian10-playbook.yml => converge.yml}   |  0
 molecule/default/molecule.yml                 | 15 +++----------
 molecule/default/tests/test_default.py        | 14 ------------
 7 files changed, 5 insertions(+), 65 deletions(-)
 rename molecule/default/yaml-lint.yml => .yamllint (82%)
 delete mode 100644 molecule/default/Dockerfile.j2
 delete mode 100644 molecule/default/INSTALL.rst
 rename molecule/default/{debian10-playbook.yml => converge.yml} (100%)
 delete mode 100644 molecule/default/tests/test_default.py

diff --git a/.travis.yml b/.travis.yml
index 670f902..35d2fe5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,9 @@ env:
     - ROLE_NAME: glpi
   matrix:
     - MOLECULE_DISTRIB: debian10:latest
-      MOLECULE_PLAYBOOK: debian10-playbook.yml
 
 install:
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   - cd ../
diff --git a/molecule/default/yaml-lint.yml b/.yamllint
similarity index 82%
rename from molecule/default/yaml-lint.yml
rename to .yamllint
index efcda88..db22c42 100644
--- a/molecule/default/yaml-lint.yml
+++ b/.yamllint
@@ -2,5 +2,5 @@
 extends: default
 rules:
   line-length:
-    max: 255
+    max: 160
     level: warning
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
deleted file mode 100644
index e6aa95d..0000000
--- a/molecule/default/Dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && 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 && 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 && xbps-remove -O; fi
diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst
deleted file mode 100644
index 6a44bde..0000000
--- a/molecule/default/INSTALL.rst
+++ /dev/null
@@ -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]'
diff --git a/molecule/default/debian10-playbook.yml b/molecule/default/converge.yml
similarity index 100%
rename from molecule/default/debian10-playbook.yml
rename to molecule/default/converge.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 279cc68..db6b475 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "thetarto/ansible-${MOLECULE_DISTRIB}"
@@ -17,11 +16,3 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-  playbooks:
-    converge: ${MOLECULE_PLAYBOOK}
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a..0000000
--- a/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +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_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'