diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 83a18d25e58ca7adc2e526f0ed30b12263cb0c13..233bc80d8f4b0a2ed98f97e33a6269dd6ef0d882 100644
--- a/.pre-commit-config.yaml
+++ b/.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
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..abc583a44f62a169059b177cabed55bfe3ab9183
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+---
+language: python
+python: "2.7"
+dist: trusty
+sudo: false
+group: beta
+services: [docker]
+cache:
+ - pip
+ - directories:
+ - $HOME/.pre-commit
+
+install:
+ - pip install -r tests/requirements.txt | cat
+ - 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/
+ email: false
diff --git a/README.rst b/README.rst
index f485b6385b3fca147e16fbb44ef4a9461f843a87..c874821cfad71a0c01e0f2a998a58300a1831ba5 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,15 @@
DHCP
####
+.. image:: https://travis-ci.org/adarnimrod/dhcp.svg?branch=master
+ :target: https://travis-ci.org/adarnimrod/dhcp
+
Provision an ISC DHCP server.
Requirements
------------
-See :code:`meta/main.yml`, :code:`tests/requirements.yml` and assertions at
-the top of :code:`tasks/main.yml`.
+See :code:`meta/main.yml` and assertions at the top of :code:`tasks/main.yml`.
Role Variables
--------------
@@ -27,21 +29,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
-------
diff --git a/ansible.cfg b/ansible.cfg
index 2bc7613f4df5ddc0fe0f2719df832ddfff4bfe62..905e3c64897217cd1b88acde10920ae04c7c6011 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -5,6 +5,7 @@ retry_files_enabled = False
roles_path = .molecule/roles:.molecule/../roles:../:../../
command_warnings = True
deprecation_warnings = True
+callback_whitelist = profile_tasks
[ssh_connection]
pipelining = True
diff --git a/defaults/main.yml b/defaults/main.yml
index 3ddc289d9e5cc374f9558f5da7591a0dcd44b907..9f04f6a25ba1bc9a78499df45a1250087e8f33be 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
---
-# defaults file for ansible-role-dhcp
+# defaults file for dhcp
diff --git a/handlers/main.yml b/handlers/main.yml
index 3ff24c8229b9c252b753a8885238f088b864aee2..db2863518a3eb913453baace6f99c632607da2da 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
---
-# handlers file for ansible-role-dhcp
+# handlers file for dhcp
diff --git a/molecule.yml b/molecule.yml
index 59f4b348e711a94b8848add50076a90126c00623..f0c41aaca7585e9191e0f1c08fe976464538b5ff 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -4,6 +4,9 @@ ansible:
playbook: tests/playbook.yml
diff: True
config_file: ../ansible.cfg
+
+dependency:
+ name: galaxy
requirements_file: tests/requirements.yml
vagrant:
@@ -13,10 +16,10 @@ vagrant:
platforms:
- name: openbsd
box: kaorimatz/openbsd-6.0-amd64
- - name: ubuntu
+ - name: xenial
box: ubuntu/xenial64
instances:
- - name: ansible-role-dhcp
+ - name: dhcp
options:
append_platform_to_hostname: yes
raw_config_args:
@@ -24,3 +27,17 @@ vagrant:
- 'vbguest.auto_update = false'
- 'landrush.enabled = false'
- 'landrush_ip.override = false'
+
+docker:
+ containers:
+ - name: dhcp-xenial
+ image: ubuntu
+ image_version: xenial
+ command: /sbin/init
+ privileged: True
+ volume_mounts:
+ - /sys/fs/cgroup:/sys/fs/cgroup
+ - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+ environment:
+ DEBIAN_FRONTEND: noninteractive
+ container: docker
diff --git a/tasks/main.yml b/tasks/main.yml
index 79e653d49ea1f395bdce6e9d18da42c32c45f58d..bf4282fce832a0becaa2976d17fef620cc7fc3cf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
---
-# tasks file for ansible-role-dhcp
+# tasks file for dhcp
- name: Assertions
assert:
diff --git a/tests/playbook.yml b/tests/playbook.yml
index fc68ac0cdf8c61836f4aaf60f6516c7f20385f0b..1aae1eac894ebec57e2e796dafc5dc03378be43b 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,12 +1,13 @@
---
-- hosts: ansible-role-example-openbsd
+- hosts: dhcp-openbsd
gather_facts: false
- roles: [openbsd_bootstrap]
+ roles: [openbsd-bootstrap]
-- hosts: ansible-role-example-ubuntu
+- hosts: dhcp-xenial
gather_facts: false
- roles: [debian_bootstrap]
+ roles: [debian-bootstrap]
- hosts: all
+ strategy: free
roles:
- - role: ansible-role-dhcp
+ - role: dhcp
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0588c359a06c17f6d8a27f8d19be6cf89b2758b8..497d43068abcde060d092a5241d0a3ddac24b589 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,11 @@
ansible==2.2.0.0
-testinfra==1.4.3
-molecule==1.13.0
-ansible-lint==3.4.4
-pre-commit==0.9.3
+testinfra==1.4.5
+molecule==1.17.0
+ansible-lint==3.4.8
+pre-commit==0.9.4
piprot==0.9.7
+python-vagrant==0.5.14
+docker-py==1.10.6
+netaddr==0.7.18
+passlib==1.7.0
+bcrypt==3.1.1
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 8b9b2bcba3b4459621ff239243ac0375a081f20a..70716f60b9e624bc5a09442517a08667363949f4 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,7 +1,5 @@
---
-- src: https://www.shore.co.il/git/ansible-role-openbsd-bootstrap
- scm: git
- name: openbsd_bootstrap
-- src: https://www.shore.co.il/git/ansible-role-debian-bootstrap
- scm: git
- name: debian_bootstrap
+- src: adarnimrod.openbsd-bootstrap
+ name: openbsd-bootstrap
+- src: adarnimrod.debian-bootstrap
+ name: debian-bootstrap
diff --git a/tests/test_example.py b/tests/test_example.py
index 12d4c7a5294fc8128e8ae695e8afaaa62a002f9b..aaea50030b9784f0528df9b936cf1903d3af5994 100644
--- a/tests/test_example.py
+++ b/tests/test_example.py
@@ -1,7 +1,12 @@
+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'
diff --git a/vars/main.yml b/vars/main.yml
index b9a5a5052806620d47d959a863fca7879b063943..2fb59b1189ef5ad9ce80ae0a8f029187d2c35baa 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
---
-# vars file for ansible-role-dhcp
+# vars file for dhcp