From 0d9f5037776de01450a4cfb1dcf58e36a393cfae Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Tue, 2 Mar 2021 10:50:22 +0100
Subject: [PATCH] Update CI requirements
* Explicitly install ansible for linting.
* Use pip to install ansible version.
* Cleanup obsolete tox.ini.
* Fix meta author to match galaxy namespace.
Signed-off-by: Ben Kochie <superq@gmail.com>
---
.circleci/config.yml | 6 +++---
meta/main.yml | 3 ++-
tox.ini | 19 -------------------
3 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 tox.ini
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd2c569..3c48aed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,8 @@ jobs:
executor: python
steps:
- checkout
- - run: pip install ansible-lint yamllint flake8
+ - run: pip install ansible ansible-lint yamllint flake8
+ - run: mkdir -p .cache/roles && ln -s ../.. .cache/roles/${CIRCLE_PROJECT_REPONAME}
- run: ansible-lint
- run: yamllint .
- run: flake8
@@ -21,12 +22,11 @@ jobs:
parameters:
ansible:
type: string
- environment:
- ANSIBLE: "<< parameters.ansible >>"
steps:
- checkout
- setup_remote_docker
- run: ln -s ~/project ~/${CIRCLE_PROJECT_REPONAME}
+ - run: pip install "ansible~=<<parameters.ansible >>.0"
- run: pip install -r test-requirements.txt
- run: molecule test -s default --destroy always
- run: |
diff --git a/meta/main.yml b/meta/main.yml
index 3491756..f6b8d40 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,7 @@
---
galaxy_info:
- author: Roman Demachkovych, Pawel Krupa
+ author: cloudalchemy
+ role_name: node_exporter
description: Prometheus Node Exporter
license: MIT
company: none
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 53f0642..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[tox]
-minversion = 1.8
-basepython = python3.8
-envlist = py38-ansible{29,210}
-skipsdist = true
-
-[travis:env]
-ANSIBLE=
- 2.9: ansible29
- 2.10: ansible210
-
-[testenv]
-passenv = GH_* DOCKER_HOST MOLECULE_*
-deps =
- -rtest-requirements.txt
- ansible29: ansible<2.10
- ansible210: ansible<2.11
-commands =
- {posargs:molecule test --all --destroy always}
--
GitLab