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 233bc80d8f4b0a2ed98f97e33a6269dd6ef0d882..bd9a4d714377ea51d2cd14419ae059cc9307b5d5 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,27 +9,15 @@
- id: flake8
- id: check-symlinks
- repo: https://github.com/adarnimrod/ansible-pre-commit.git
- sha: 0fadd691465b97db8992cfc66650f630e433324b
+ 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.12
hooks:
- id: ansible-lint
- always_run: true
files: tests/playbook.yml
- args:
- - tests/playbook.yml
-- repo: local
+- repo: https://github.com/adarnimrod/python-pre-commit.git
+ sha: v0.2.0
hooks:
- id: piprot
- name: piprot
- description: Check up-to-date Python requirements
- language: system
- entry: piprot --quiet --outdated tests/requirements.txt
- files: requirements.txt
- always_run: true
diff --git a/.travis.yml b/.travis.yml
index 3934d45400203d8063760cca527fb0bc5c6c8ee8..225db5e06039bbca9219f3eeb174b772811130ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,41 @@
language: python
python: "2.7"
dist: trusty
-sudo: false
+sudo: True
group: beta
-services: [docker]
+env:
+ global:
+ - VBOX_MEMORY=2048
+ matrix:
+ - TOXENV=pre-commit
+ - TOXENV=openbsd60
+ - TOXENV=xenial
+ - TOXENV=trusty
+ - TOXENV=precise
+ - &stretch TOXENV=stretch
+ - &jessie TOXENV=jessie
+ - TOXENV=wheezy
+matrix:
+ fast_finish: True
+ allow_failures:
+ - env: *stretch
+ - env: *jessie
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
+ - sudo apt-get update
+ - 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 tox-travis | cat
script:
- - pre-commit run --all-files
- - travis_wait 45 molecule test --driver docker
+ - travis_wait 45 tox
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
email: false
+ on_failure: never
diff --git a/README.rst b/README.rst
index a900a32330d78d93f59d457b6e123cbf4b8f8475..9511a4911e0f2442af9075cfacec5759fdc2a5e2 100644
--- a/README.rst
+++ b/README.rst
@@ -34,22 +34,9 @@ See :code:`tests/playbook.yml`.
Testing
-------
-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
- 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/molecule.yml b/molecule.yml
index 3a0686b405b1b298751e0bb3277900410b8e26ae..8b24ea3c7d605a807ca29aa939c582328bc54d18 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
@@ -13,53 +17,35 @@ vagrant:
providers:
- name: virtualbox
type: virtualbox
+ options:
+ cpus: 1
platforms:
- - name: openbsd
- box: kaorimatz/openbsd-6.0-amd64
- - name: jessie
- box: debian/jessie64
+ - name: openbsd60
+ box: fnichol/openbsd-6.0-i386
- name: xenial
- box: ubuntu/xenial64
+ box: ubuntu/xenial32
- name: trusty
- box: ubuntu/trusty64
+ box: ubuntu/trusty32
+ - name: precise
+ box: hashicorp/precise32
+ - name: stretch
+ box: remram/debian-9-i386
+ - name: jessie
+ box: deb/jessie-i386
+ - name: wheezy
+ box: bmorg/debian-wheezy-i386
instances:
- name: nginx
options:
append_platform_to_hostname: yes
raw_config_args:
+ - 'vm.boot_timeout = 600'
- 'vm.synced_folder ".", "/vagrant", disabled: true'
- - 'vbguest.auto_update = false'
- - 'landrush.enabled = false'
- - 'landrush_ip.override = false'
-
-docker:
- containers:
- - name: nginx-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
- - name: nginx-jessie
- image: debian
- image_version: jessie
- 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
- - name: nginx-trusty
- image: ubuntu-upstart
- image_version: trusty
- command: /sbin/init
- environment:
- DEBIAN_FRONTEND: noninteractive
- container: docker
+ - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
+ - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
+ - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
+ - |
+ vm.provider "virtualbox" do |v|
+ v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+ 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 93c739ae20e184c4be07f8415173acd317dd69f8..43266a309ccaba5e3f34edca3a3285ee09983d68 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,7 +5,7 @@
that:
- ansible_os_family in aliases_file
- ansible_os_family in nginx_user
- - ansible_pkg_mgr != 'openbsd_pkg' or ansible_distribution_release in nginx_openbsd_pkg
+ - ansible_pkg_mgr != 'openbsd_pkg' or ansible_distribution_version in nginx_openbsd_pkg
- name: Check if dhparams file exists
stat:
@@ -23,7 +23,7 @@
- name: pkg install
when: ansible_pkg_mgr == 'openbsd_pkg'
openbsd_pkg:
- name: '{{ nginx_openbsd_pkg[ansible_distribution_release] }}'
+ name: '{{ nginx_openbsd_pkg[ansible_distribution_version] }}'
state: present
- name: Alias emails to root
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 5aa073873b9fbd4175b514a338a25da929e2ac7e..5697b9bcfb66e0846d83fe26d3d595ba31f5ff2f 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,14 +1,23 @@
---
-- hosts: nginx-openbsd
+- hosts: nginx-openbsd*
gather_facts: false
- roles: [openbsd-bootstrap]
+ roles:
+ - openbsd-bootstrap
+ - role: users
+ users: []
+ users_use_sudo: True
+ users_lock_root_ssh: False
-- hosts: nginx-xenial
+- hosts: [nginx-xenial, nginx-wheezy]
gather_facts: false
- roles: [debian-bootstrap]
+ roles:
+ - debian-bootstrap
+ - role: users
+ users: []
+ users_use_sudo: True
+ users_lock_root_ssh: False
- hosts: all
- serial: 1
roles:
- ca-store
- nginx
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 2e455727c40eeac3b9f47877c6804f18f894852d..c0ffb8cc7e76a09533f8b216ed2374b29e94fdff 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,11 +1,8 @@
-ansible==2.2.0.0
-testinfra==1.4.5
-molecule==1.17.0
-ansible-lint==3.4.9
-pre-commit==0.9.4
-piprot==0.9.7
+ansible==2.3.0.0
+testinfra==1.5.5
+molecule==1.23.2
+ansible-lint==3.4.12
python-vagrant==0.5.14
-docker-py==1.10.6
-netaddr==0.7.18
-passlib==1.7.0
-bcrypt==3.1.2
+netaddr==0.7.19
+passlib==1.7.1
+bcrypt==3.1.3
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 6b505e6b0f83fe9e31370f482b7e00eb477d8495..e870ee2fd44c6f1f3e27bf05d6556889374dae54 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -5,3 +5,5 @@
name: debian-bootstrap
- src: adarnimrod.ca-store
name: ca-store
+- src: adarnimrod.users
+ name: users
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..cd0873a5e0615e8dc74819f9051557d358d1d392
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,27 @@
+[tox]
+skip_install = True
+skipsdist = True
+envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy
+
+[testenv]
+envdir = {toxinidir}/.tox
+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]
+envdir = {toxinidir}/.tox
+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