From 0993dde2c6fb0f3c5b0527a9d0563e08bf65d083 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@ess.eu>
Date: Fri, 21 Aug 2020 13:04:40 +0200
Subject: [PATCH] Update to molecule v3
---
.ansible-lint | 5 +++++
.flake8 | 2 +-
.yamllint | 1 +
molecule/default/Dockerfile.j2 | 14 --------------
molecule/default/molecule.yml | 11 +++++------
5 files changed, 12 insertions(+), 21 deletions(-)
delete mode 100644 molecule/default/Dockerfile.j2
diff --git a/.ansible-lint b/.ansible-lint
index 3f7f42d..9806481 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,2 +1,7 @@
+exclude_paths:
+ - molecule/default/create.yml
skip_list:
- '602'
+ - '204'
+ - '208'
+ - '106'
diff --git a/.flake8 b/.flake8
index 5384053..7a5c81e 100644
--- a/.flake8
+++ b/.flake8
@@ -1,2 +1,2 @@
[flake8]
-ignore = E501,W503,E203
+ignore = E501,W503,E203,E402
diff --git a/.yamllint b/.yamllint
index 3a2255e..8bb60ab 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
extends: default
rules:
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
deleted file mode 100644
index 7b76a7c..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 /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && 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/molecule.yml b/molecule/default/molecule.yml
index 5276ce2..bcb9304 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,15 +3,16 @@ dependency:
name: galaxy
options:
role-file: roles/requirements.yml
-lint:
- name: yamllint
+lint: |
+ set -e
+ yamllint .
+ ansible-lint
+ flake8
provisioner:
name: ansible
config_options:
defaults:
gather_timeout: 20
- lint:
- name: ansible-lint
playbooks:
converge: ../../playbook.yml
inventory:
@@ -22,8 +23,6 @@ scenario:
name: default
verifier:
name: testinfra
- lint:
- name: flake8
driver:
name: docker
platforms:
--
GitLab