From 3c6e49552353fb27a9a40189d7be879c40fd328d Mon Sep 17 00:00:00 2001
From: Robert Kaussow <robert.kaussow@mail.schwarz>
Date: Tue, 12 Mar 2019 11:47:30 +0100
Subject: [PATCH] test with new image

---
 .drone.1.yml   | 58 --------------------------------------------------
 .drone.jsonnet |  6 +-----
 .drone.yml     |  6 +-----
 3 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 .drone.1.yml

diff --git a/.drone.1.yml b/.drone.1.yml
deleted file mode 100644
index 4c9c9c6..0000000
--- a/.drone.1.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-kind: pipeline
-name: default
-
-workspace:
-  base: /drone/src
-  path: xoxys.nginx
-
-steps:
-  - name: ansible-latest
-    image: python:2.7
-    pull: always
-    environment:
-      PY_COLORS: 1
-    commands:
-      - pip install ansible ansible-later -qq
-      - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy
-      - git ls-files *[^LICENSE,.md,molecule,.ini] | xargs ansible-later -c ~/policy/config.ini
-    depends_on: [ clone ]
-
-  - name: ansible-master
-    image: python:2.7
-    pull: always
-    environment:
-      PY_COLORS: 1
-    commands:
-      - pip install git+https://github.com/ansible/ansible.git@devel -qq
-      - pip install ansible-later -qq
-      - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy
-      - git ls-files *[^LICENSE,.md,molecule,.ini] | xargs ansible-later -c ~/policy/config.ini
-    depends_on: [ clone ]
-
-  - name: molecule
-    image: xoxys/molecule:gce
-    pull: always
-    environment:
-      GCE_SSH_KEY:
-        from_secret: gce_ssh_key
-      GCE_SERVICE_ACCOUNT_EMAIL:
-        from_secret: gce_service_account_email
-      GCE_PROJECT_ID:
-        from_secret: gce_project_id
-      GCE_CREDENTIALS_JSON:
-        from_secret: gce_credentials_json
-      GCE_SSH_USER:
-        from_secret: gce_ssh_user
-      GCE_CREDENTIALS_FILE: $HOME/ansible-testing.json
-      PY_COLORS: 1
-    commands:
-      - mkdir ./library/
-      - git clone https://gitea.rknet.org/ansible/custom_modules ./library/
-      - echo "$GCE_SSH_KEY" > $HOME/.ssh/google_compute_engine
-      - chmod 600 $HOME/.ssh/google_compute_engine
-      - echo "$GCE_CREDENTIALS_JSON" > $HOME/ansible-testing.json
-      - molecule create --scenario-name gce-centos-7
-      - molecule converge --scenario-name gce-centos-7
-      - molecule verify --scenario-name gce-centos-7
-      - molecule destroy --scenario-name gce-centos-7
diff --git a/.drone.jsonnet b/.drone.jsonnet
index 1459978..fbdb822 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -51,14 +51,10 @@ local PipelineDeployment = {
         GCE_CREDENTIALS_JSON: { "from_secret": "gce_credentials_json" },
         GCE_SSH_USER: { "from_secret": "gce_ssh_user" },
         GCE_CREDENTIALS_FILE: "$HOME/ansible-testing.json",
+        MOLECULE_CUSTOM_MODULES_REPO: "https://gitea.rknet.org/ansible/custom_modules",
         PY_COLORS: 1
       },
       commands: [
-        "mkdir ./library/",
-        "git clone https://gitea.rknet.org/ansible/custom_modules ./library/",
-        "echo \"$GCE_SSH_KEY\" > $HOME/.ssh/google_compute_engine",
-        "chmod 600 $HOME/.ssh/google_compute_engine",
-        "echo \"$GCE_CREDENTIALS_JSON\" > $HOME/ansible-testing.json",
         "molecule create --scenario-name gce-centos-7",
         "molecule converge --scenario-name gce-centos-7",
         "molecule verify --scenario-name gce-centos-7",
diff --git a/.drone.yml b/.drone.yml
index 09a33f3..e4837a6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -48,11 +48,6 @@ steps:
   pull: always
   image: xoxys/molecule:gce
   commands:
-  - mkdir ./library/
-  - git clone https://gitea.rknet.org/ansible/custom_modules ./library/
-  - "echo \"$GCE_SSH_KEY\" > $HOME/.ssh/google_compute_engine"
-  - chmod 600 $HOME/.ssh/google_compute_engine
-  - "echo \"$GCE_CREDENTIALS_JSON\" > $HOME/ansible-testing.json"
   - molecule create --scenario-name gce-centos-7
   - molecule converge --scenario-name gce-centos-7
   - molecule verify --scenario-name gce-centos-7
@@ -69,6 +64,7 @@ steps:
       from_secret: gce_ssh_key
     GCE_SSH_USER:
       from_secret: gce_ssh_user
+    MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules
     PY_COLORS: 1
 
 depends_on: