diff --git a/.gitignore b/.gitignore
index e1cf205905d93c46016f27f9e4df6a1da11cfd86..966ef052e8cb1dfe9ab17eff54ee874231f5dbb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ __pycache__
.vagrant/
*.log
*.retry
+.tox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 13eb0f0645a7773ac752210f1bde980e2b30c859..13dbdf1997b4d7115d467b019b31712b08540e26 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
- repo: https://github.com/pre-commit/pre-commit-hooks
- sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469
+ sha: v0.7.1
hooks:
- id: check-added-large-files
- id: check-json
@@ -9,22 +9,15 @@
- id: flake8
- id: check-symlinks
- repo: https://github.com/adarnimrod/ansible-pre-commit.git
- sha: v0.5.0
+ sha: v0.6.0
hooks:
- id: ansible-syntax-check
- always_run: true
- files: tests/playbook.yml
- args:
- - tests/playbook.yml
- repo: https://github.com/willthames/ansible-lint
- sha: 959ab0f525e9abb19cf75f34381015cf33695f61
+ sha: v3.4.13
hooks:
- id: ansible-lint
- always_run: true
files: tests/playbook.yml
- args:
- - tests/playbook.yml
- repo: https://github.com/adarnimrod/python-pre-commit.git
- sha: v0.1.0
+ sha: v0.2.0
hooks:
- id: piprot
diff --git a/.travis.yml b/.travis.yml
index c208cb6596e89bbb3f9a9df6ebc15ba037835887..294486a7ff22af0c429b27ead68efa72f2bb3c2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,23 @@
---
language: python
-python: ["2.7", "3.5"]
+python: "2.7"
dist: trusty
sudo: True
group: beta
env:
global:
- VBOX_MEMORY=2048
+ - VBOX_HWVIRTEX=off
matrix:
- - platform: openbsd60
- - &openbsd59 platform=openbsd59
- - &openbsd56 platform=openbsd56
- - platform: xenial
- - platform: trusty
- - platform: precise
- - &stretch platform=stretch
- - platform: jessie
- - platform: wheezy
-matrix:
- fast_finish: True
- allow_failures:
- - python: "3.5"
- - env: *openbsd59
- - env: *openbsd56
- - env: *stretch
+ - TOXENV=openbsd60
+ - TOXENV=openbsd56
+ - TOXENV=xenial
+ - TOXENV=trusty
+ - TOXENV=precise
+ - &stretch TOXENV=stretch
+ - &jessie TOXENV=jessie
+ - TOXENV=wheezy
+
cache:
- pip
- directories:
@@ -34,15 +28,23 @@ install:
- sudo apt-get install -y linux-headers-$(uname -r) virtualbox
- wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb
- sudo dpkg -i vagrant_1.9.1_x86_64.deb
- - pip install -r tests/requirements.txt | cat
- - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
- - molecule dependency
+ - &pip_install pip install tox-travis | cat
script:
- - pre-commit run --all-files
- - travis_wait 45 molecule test --platform $platform
+ - travis_wait 45 tox
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
email: false
on_failure: never
+
+matrix:
+ fast_finish: True
+ allow_failures:
+ - env: *stretch
+ include:
+ - env:
+ TOXENV: pre-commit
+ install:
+ - *pip_install
+ sudo: False
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000000000000000000000000000000000..57e457ec22c6c18aac27a138882f83e8c5022012
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,38 @@
+/*
+Jenkins pipeline for testing an Ansible role.
+Required software on the agent:
+- Python 2.7.
+- Tox.
+- Vagrant.
+- Virtualbox.
+*/
+pipeline {
+ agent any
+ environment {
+ VBOX_HWVIRTEX = off
+ }
+ stages {
+ stage('install') {
+ steps {
+ sh 'git submodule update --init --recursive'
+ }
+ }
+ stage('test') {
+ steps {
+ parallel (
+ 'pre-commit': {
+ sh 'tox -e pre-commit'
+ }
+ 'molecule': {
+ sh 'tox'
+ }
+ )
+ }
+ }
+ }
+ post {
+ success {
+ sh 'tox -e import'
+ }
+ }
+}
diff --git a/README.rst b/README.rst
index c0913d3fea3fec39e623f4a16534811516f400a7..8f72662f640c1f7ac0d31267d61ab0636e61d246 100644
--- a/README.rst
+++ b/README.rst
@@ -29,21 +29,9 @@ See :code:`tests/playbook.yml`.
Testing
-------
-Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python
-dependencies, dependent roles and roles required for testing:
-
-.. code:: shell
-
- pip install -r tests/requirements.txt
- 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
-
- pre-commit run --all-files
- molecule test --platform all
+Testing requires Python 2.7, Tox, Vagrant and Virtualbox. To test simply run
+:code:`tox`. `Pre-commit <http://pre-commit.com/>`_ is also setup for this
+project.
License
-------
diff --git a/meta/main.yml b/meta/main.yml
index e527e1e870ede413cbac89ff865fa3d75c245a1c..eb80f0d5e7f4119b362be77603450a6d6222b6ca 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -3,7 +3,7 @@ galaxy_info:
description: Install Python 2.7, pip and packages to enable SSL SNI support (if needed)
company: Shore technologies
license: MIT
- min_ansible_version: 2.0
+ min_ansible_version: 2.3
platforms:
- name: OpenBSD
versions:
@@ -12,15 +12,15 @@ galaxy_info:
- 5.8
- 5.9
- 6.0
- - name: Debian
- versions:
- - wheezy
- - jessie
- - stretch
- name: Ubuntu
versions:
- - precise
- - trusty
- xenial
+ - trusty
+ - precise
+ - name: Debian
+ versions:
+ - stretch
+ - jessie
+ - wheezy
galaxy_tags: [ ansible, python ]
dependencies: []
diff --git a/molecule.yml b/molecule.yml
index 03011c54c55258738218acb74e27073e0faf998b..75073bb1f2feede32ea53773680b8f4b018705fc 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -5,6 +5,10 @@ ansible:
diff: True
config_file: ../ansible.cfg
+molecule:
+ ignore_paths:
+ - .tox
+
dependency:
name: galaxy
requirements_file: tests/requirements.yml
@@ -20,8 +24,6 @@ vagrant:
box: tmatilai/openbsd-5.6
- name: openbsd60
box: fnichol/openbsd-6.0-i386
- - name: openbsd59
- box: fnichol/openbsd-5.9-i386
- name: xenial
box: ubuntu/xenial32
- name: trusty
@@ -29,7 +31,7 @@ vagrant:
- name: precise
box: hashicorp/precise32
- name: stretch
- box: remram/debian-9-i386
+ box: koalephant/debian9-i386
- name: jessie
box: deb/jessie-i386
- name: wheezy
@@ -46,6 +48,6 @@ vagrant:
- 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
- |
vm.provider "virtualbox" do |v|
- v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+ v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", ENV['VBOX_HWVIRTEX']] if ENV.has_key?('VBOX_HWVIRTEX')
v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY')
end
diff --git a/tasks/main.yml b/tasks/main.yml
index 3996704310ebcb11507be3538fc521c86a389c23..2868fa68f991af25e589dba32cc781f0d9397a6c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,7 +5,7 @@
assert:
that:
- ansible_os_family in ['OpenBSD', 'Debian']
- - ansible_distribution_release in ['5.6', '5.7', '5.8', '5.9', '6.0', 'precise', 'trusty', 'xenial', 'wheezy', 'jessie', 'stretch', 'NA']
+ - ansible_distribution_release in ['xenial', 'trusty', 'precise', 'stretch', 'jessie', 'wheezy'] or ansible_distribution_version in ['6.0']
- python27_packages is iterable
- name: APT install
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 4048613cd74709b38431e3ad1d4010fcef266f4a..d926e184daf74411839e4da335752ce756f84e23 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,10 +1,8 @@
-ansible==2.2.1.0
-testinfra==1.5.3
-molecule==1.20.0
-ansible-lint==3.4.10
-pre-commit==0.12.2
-piprot==0.9.7
-python-vagrant==0.5.14
+ansible==2.3.1.0
+testinfra==1.6.3
+molecule==1.25.0
+ansible-lint==3.4.13
+python-vagrant==0.5.15
netaddr==0.7.19
passlib==1.7.1
-bcrypt==3.1.2
+bcrypt==3.1.3
diff --git a/tests/test_example.py b/tests/test_example.py
index aaea50030b9784f0528df9b936cf1903d3af5994..3c308b7bc441b051237f60b2a935f56ce357557d 100644
--- a/tests/test_example.py
+++ b/tests/test_example.py
@@ -3,10 +3,10 @@ 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_example(host):
+ assert host.run('uname').rc == 0
-def test_root(Command, Sudo):
- with Sudo():
- assert Command('whoami').stdout.strip() == 'root'
+def test_root(host):
+ with host.sudo():
+ assert host.run('whoami').stdout.strip() == 'root'
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..c80d480b6f557c37a14f6ec977a2900494e95d51
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,31 @@
+[tox]
+skip_install = True
+skipsdist = True
+envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy
+
+[testenv]
+envdir = {toxinidir}/.tox/molecule
+deps = -rtests/requirements.txt
+passenv = HOME VBOX* ANSIBLE_*
+whitelist_externals =
+ sh
+commands =
+ sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"
+ molecule test --platform {envname}
+
+[testenv:pre-commit]
+deps =
+ -rtests/requirements.txt
+ pre-commit
+passenv = HOME VBOX* ANSIBLE_*
+whitelist_externals =
+ sh
+commands =
+ sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"
+ molecule dependency
+ pre-commit run --all-files
+
+[testenv:import]
+envdir = {toxinidir}/.tox/molecule
+deps = -rtests/requirements.txt
+commands = ansible-galaxy import -v