From b067186e30fb3d7a2ede990f492e3262c0be719e Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 12 May 2019 14:19:55 +0200
Subject: [PATCH] refactor molecule

---
 .drone.jsonnet                     | 2 ++
 .drone.yml                         | 6 +-----
 molecule/ec2-centos-7/molecule.yml | 3 ---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index b0a9a52..417097b 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -48,6 +48,7 @@ local PipelineDeployment = {
       image: "xoxys/molecule:ec2-linux-amd64",
       pull: "always",
       environment: {
+        ANSIBLE_ROLES_PATH: "/drone/src",
         AWS_ACCESS_KEY_ID: { "from_secret": "aws_access_key_id" },
         AWS_SECRET_ACCESS_KEY: { "from_secret": "aws_secret_access_key" },
         AWS_REGION: "eu-central-1",
@@ -55,6 +56,7 @@ local PipelineDeployment = {
         PY_COLORS: 1
       },
       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",
diff --git a/.drone.yml b/.drone.yml
index a3b4f8d..261b382 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -54,17 +54,13 @@ steps:
   pull: always
   image: xoxys/molecule:ec2-linux-amd64
   commands:
-  - /bin/bash /docker-entrypoint.sh 
-  - pwd
-  - ls -l /library
-  - ansible --version
+  - /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
   environment:
     ANSIBLE_ROLES_PATH: /drone/src
-    ANSIBLE_LIBRARY: /library 
     AWS_ACCESS_KEY_ID:
       from_secret: aws_access_key_id
     AWS_REGION: eu-central-1
diff --git a/molecule/ec2-centos-7/molecule.yml b/molecule/ec2-centos-7/molecule.yml
index 2c495da..3cf9083 100644
--- a/molecule/ec2-centos-7/molecule.yml
+++ b/molecule/ec2-centos-7/molecule.yml
@@ -10,9 +10,6 @@ platforms:
     vpc_subnet_id: subnet-9b6896f1
 provisioner:
   name: ansible
-  env:
-    ANSIBLE_ROLES_PATH: /drone/src
-    ANSIBLE_LIBRARY: /library
   lint:
     name: ansible-lint
 verifier: