Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/ansible-role-example

.pre-commit-config.yaml

@@ -8,7 +8,7 @@
     -   id: check-merge-conflict
     -   id: flake8
     -   id: check-symlinks
--   repo: https://www.shore.co.il/git/ansible-pre-commit
+-   repo: https://github.com/adarnimrod/ansible-pre-commit.git
     sha: 0fadd691465b97db8992cfc66650f630e433324b
     hooks:
     -   id: ansible-syntax-check

.travis.yml

+---
+language: python
+python: "2.7"
+dist: trusty
+sudo: false
+group: beta
+services: [docker]
+
+install:
+  - pip install -r tests/requirements.txt
+  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+  - molecule dependency
+
+script:
+  - pre-commit run --all-files
+  - molecule test --driver docker
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.rst

@@ -27,21 +27,22 @@ 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 Python 2.7 and either Docker or Vagrant and Virtualbox.
+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
 -------

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:
@@ -30,3 +33,11 @@ vagrant:
   - 'vbguest.auto_update = false'
   - 'landrush.enabled = false'
   - 'landrush_ip.override = false'
+
+docker:
+  containers:
+  - name: ansible-role-example-ubuntu
+    image: ubuntu
+    image_version: xenial
+    environment:
+        DEBIAN_FRONTEND: noninteractive

tests/requirements.txt

 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
+python-vagrant==0.5.14
+docker-py==1.10.6

tests/requirements.yml

 ---
-- src: https://www.shore.co.il/git/ansible-role-openbsd-bootstrap
+- src: https://github.com/adarnimrod/ansible-role-openbsd-bootstrap
   scm: git
   name: openbsd_bootstrap
-- src: https://www.shore.co.il/git/ansible-role-debian-bootstrap
+- src: https://github.com/adarnimrod/ansible-role-debian-bootstrap
   scm: git
   name: debian_bootstrap

tests/test_example.py

+from testinfra.utils.ansible_runner import AnsibleRunner
+
+testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
+
+
 def test_example(Command):
     assert Command('uname').rc == 0
 
 
 def test_root(Command, Sudo):
     with Sudo():
-        assert Command('whoami').stdout == 'root'
+        assert Command('whoami').stdout.strip() == 'root'