From c1fcaf7cee2cdd0f722496e48045e8ecd9512901 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 26 May 2019 17:22:41 +0200
Subject: [PATCH] fix molecule setup

---
 .drone.jsonnet                              | 5 +----
 .drone.yml                                  | 7 ++-----
 molecule/ec2-centos-7/molecule.yml          | 4 ++++
 molecule/ec2-centos-7/tests/test_default.py | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index a5acbdc..ba0e164 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -58,10 +58,7 @@ local PipelineDeployment = {
       },
       commands: [
         "/bin/bash /docker-entrypoint.sh",
-        "molecule create --scenario-name ec2-centos-7",
-        "molecule converge --scenario-name ec2-centos-7",
-        "molecule verify --scenario-name ec2-centos-7",
-        "molecule destroy --scenario-name ec2-centos-7",
+        "molecule test --scenario-name ec2-centos-7",
       ],
     },
   ],
diff --git a/.drone.yml b/.drone.yml
index f6a3d70..df817d9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -55,10 +55,7 @@ steps:
   image: xoxys/molecule:ec2-linux-amd64
   commands:
   - /bin/bash /docker-entrypoint.sh
-  - molecule create --scenario-name ec2-centos-7
-  - molecule converge --scenario-name ec2-centos-7
-  - molecule verify --scenario-name ec2-centos-7
-  - molecule destroy --scenario-name ec2-centos-7
+  - molecule test --scenario-name ec2-centos-7
   environment:
     ANSIBLE_ROLES_PATH: /drone/src
     AWS_ACCESS_KEY_ID:
@@ -114,6 +111,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 245fb3cb141388467c22c1fb0949baf109e53f11a8bb5d1547fa156040e7e692
+hmac: 2956b26d8b75957c13cbfb8873356b4cc6b8c9935fa8efa2148f4473a604096d
 
 ...
diff --git a/molecule/ec2-centos-7/molecule.yml b/molecule/ec2-centos-7/molecule.yml
index ff4c033..5019ba9 100644
--- a/molecule/ec2-centos-7/molecule.yml
+++ b/molecule/ec2-centos-7/molecule.yml
@@ -8,10 +8,14 @@ platforms:
     image: ami-04cf43aca3e6f3de3
     instance_type: t2.micro
     vpc_subnet_id: subnet-9b6896f1
+lint:
+  name: yamllint
+  enabled: False
 provisioner:
   name: ansible
   lint:
     name: ansible-lint
+    enabled: False
 verifier:
   name: testinfra
   lint:
diff --git a/molecule/ec2-centos-7/tests/test_default.py b/molecule/ec2-centos-7/tests/test_default.py
index 3c70625..6d3f5d2 100644
--- a/molecule/ec2-centos-7/tests/test_default.py
+++ b/molecule/ec2-centos-7/tests/test_default.py
@@ -13,8 +13,8 @@ def test_docker_is_installed(host):
     docker = host.package("docker")
     assert docker.is_installed
 
+
 def test_docker_running_and_enabled(host):
     docker = host.service("docker")
     assert docker.is_running
     assert docker.is_enabled
-