From 6409347775813460d1aaa3edb965d8ce0a97b434 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 23 Sep 2019 10:45:23 +0200 Subject: [PATCH] switch molecule image used by drone --- .drone.jsonnet | 9 +++------ .drone.yml | 14 +++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 8c4223f..fb1ca45 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -45,20 +45,17 @@ local PipelineDeployment = { steps: [ { name: "molecule", - image: "xoxys/molecule:ec2-linux-amd64", + image: "xoxys/molecule:do-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", + DO_API_KEY: { "from_secret": "do_api_key" }, MOLECULE_CUSTOM_MODULES_REPO: "https://gitea.rknet.org/ansible/custom_modules", MOLECULE_CUSTOM_FILTERS_REPO: "https://gitea.rknet.org/ansible/custom_filters", PY_COLORS: 1 }, commands: [ "/bin/bash /docker-entrypoint.sh", - "molecule test --scenario-name ec2-centos-7", + "molecule test -s default", ], }, ], diff --git a/.drone.yml b/.drone.yml index dbab52b..8f5bbab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,17 +52,13 @@ workspace: steps: - name: molecule pull: always - image: xoxys/molecule:ec2-linux-amd64 + image: xoxys/molecule:do-linux-amd64 commands: - /bin/bash /docker-entrypoint.sh - - molecule test --scenario-name ec2-centos-7 + - molecule test -s default environment: - ANSIBLE_ROLES_PATH: /drone/src - AWS_ACCESS_KEY_ID: - from_secret: aws_access_key_id - AWS_REGION: eu-central-1 - AWS_SECRET_ACCESS_KEY: - from_secret: aws_secret_access_key + DO_API_KEY: + 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 PY_COLORS: 1 @@ -111,6 +107,6 @@ depends_on: --- kind: signature -hmac: 2b6faa3292bf4a3836e2d1b479e8f2a6627558420f35e293ef8d8e9db223c237 +hmac: ee260a4d2110cdb893b7f7eee860a905648ae3fcd4010eaf10bb20e13202f02e ...