From a82f5bde1d7226716bc81397da117dc692efc513 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 22 Nov 2016 10:28:34 +0200
Subject: [PATCH] - Upgraded Molecule to 1.14.0, updated the docs and
molecule.yml accordingly.
---
README.rst | 10 +++++-----
molecule.yml | 3 +++
tests/requirements.txt | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/README.rst b/README.rst
index 29b4ed2..e42e9d0 100644
--- a/README.rst
+++ b/README.rst
@@ -29,21 +29,21 @@ See :code:`tests/playbook.yml`.
Testing
-------
-Testing requires Virtualbox and Vagrant and Python 2.7. Install the Python
-dependencies, add pre-commit hooks by running:
+Testing requires Virtualbox, Vagrant and Python 2.7. Install the Python
+dependencies, dependent roles and roles required for testing:
.. code:: shell
pip install -r tests/requirements.txt
- pre-commit install
+ ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+ molecule dependency
To run the full test suite:
.. code:: shell
- ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
- molecule test --platform all
pre-commit run --all-files
+ molecule test --platform all
License
-------
diff --git a/molecule.yml b/molecule.yml
index 16a28c0..8772054 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -4,6 +4,9 @@ ansible:
playbook: tests/playbook.yml
diff: True
config_file: ../ansible.cfg
+
+dependencies:
+ name: galaxy
requirements_file: tests/requirements.yml
vagrant:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0588c35..e8f371f 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,6 @@
ansible==2.2.0.0
testinfra==1.4.3
-molecule==1.13.0
+molecule==1.14.0
ansible-lint==3.4.4
pre-commit==0.9.3
piprot==0.9.7
--
GitLab