From 33f8432c5e020c7063651e8797b9dd0a11bdb46a Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Fri, 21 Feb 2020 00:46:35 +0100
Subject: [PATCH] upgrade to molecule v3

---
 .drone.jsonnet                                  | 10 +++++-----
 .drone.yml                                      | 11 +++++------
 molecule/centos7/{playbook.yml => converge.yml} |  0
 molecule/centos7/molecule.yml                   | 14 +++-----------
 4 files changed, 13 insertions(+), 22 deletions(-)
 rename molecule/centos7/{playbook.yml => converge.yml} (100%)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 250ecf0..90d012c 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -8,7 +8,7 @@ local PipelineLinting = {
   steps: [
     {
       name: 'ansible-later',
-      image: 'xoxys/ansible-later:latest',
+      image: 'xoxys/ansible-later',
       commands: [
         'ansible-later',
       ],
@@ -36,10 +36,10 @@ local PipelineDeployment(scenario='centos7') = {
   steps: [
     {
       name: 'ansible-molecule',
-      image: 'xoxys/molecule:latest',
+      image: 'xoxys/molecule:3',
+      pull: 'always',
       environment: {
         DO_API_KEY: { from_secret: 'do_api_key' },
-        USER: 'root',
         MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules',
         MOLECULE_CUSTOM_FILTERS_REPO: 'https://gitea.rknet.org/ansible/custom_filters',
       },
@@ -66,7 +66,7 @@ local PipelineDocumentation = {
   steps: [
     {
       name: 'generate',
-      image: 'xoxys/ansible-doctor:latest',
+      image: 'xoxys/ansible-doctor',
       environment: {
         ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO',
         ANSIBLE_DOCTOR_FORCE_OVERWRITE: true,
@@ -78,7 +78,7 @@ local PipelineDocumentation = {
     },
     {
       name: 'publish',
-      image: 'plugins/gh-pages:latest',
+      image: 'plugins/gh-pages',
       settings: {
         remote_url: 'https://gitea.rknet.org/ansible/xoxys.sshd',
         netrc_machine: 'gitea.rknet.org',
diff --git a/.drone.yml b/.drone.yml
index f90e778..07433c0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 steps:
 - name: ansible-later
-  image: xoxys/ansible-later:latest
+  image: xoxys/ansible-later
   commands:
   - ansible-later
 
@@ -35,7 +35,7 @@ workspace:
 
 steps:
 - name: ansible-molecule
-  image: xoxys/molecule:latest
+  image: xoxys/molecule:3
   commands:
   - molecule test -scentos7
   environment:
@@ -43,7 +43,6 @@ steps:
       from_secret: do_api_key
     MOLECULE_CUSTOM_FILTERS_REPO: https://gitea.rknet.org/ansible/custom_filters
     MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules
-    USER: root
 
 trigger:
   ref:
@@ -63,7 +62,7 @@ platform:
 
 steps:
 - name: generate
-  image: xoxys/ansible-doctor:latest
+  image: xoxys/ansible-doctor
   environment:
     ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
     ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
@@ -73,7 +72,7 @@ steps:
     ANSIBLE_DOCTOR_TEMPLATE: hugo-book
 
 - name: publish
-  image: plugins/gh-pages:latest
+  image: plugins/gh-pages
   settings:
     netrc_machine: gitea.rknet.org
     pages_directory: _docs/
@@ -147,6 +146,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: e693d8c058421828227f5b96688ead38fe81bc8b669f4478088fec33a2dd47de
+hmac: 4609b33ee53cb5158a47f1fdd6943834fc81114e39c767e9b6482b509e3ece85
 
 ...
diff --git a/molecule/centos7/playbook.yml b/molecule/centos7/converge.yml
similarity index 100%
rename from molecule/centos7/playbook.yml
rename to molecule/centos7/converge.yml
diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml
index a7848d3..0b3f331 100644
--- a/molecule/centos7/molecule.yml
+++ b/molecule/centos7/molecule.yml
@@ -2,23 +2,15 @@
 dependency:
   name: galaxy
 driver:
-  name: digitalocean
+  name: delegated
 platforms:
   - name: centos7-sshd
     region_id: fra1
     image_id: centos-7-x64
     size_id: s-1vcpu-1gb
-lint:
-  name: yamllint
-  enabled: False
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-    enabled: False
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    options:
-      max-line-length: 120
+  lint: |
+    flake8 --max-line-length=110