diff --git a/README.rst b/README.rst index 29b4ed2fa7911e1bf9ec9e904ee61f1b63a85b6b..e42e9d09c8e07713db7b36d0dd19c614515a71ae 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 16a28c066171bd1ac65cf917161d8923d1751a91..8772054af9b88aec11599f311a6db31a82475ce7 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 0588c359a06c17f6d8a27f8d19be6cf89b2758b8..e8f371f99903add746cc2e949f37b0e98b4d122e 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