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

# Conflicts:
#	tests/requirements.txt

.pre-commit-config.yaml

@@ -13,7 +13,7 @@
     hooks:
     -   id: ansible-syntax-check
 -   repo: https://github.com/willthames/ansible-lint
-    sha: v3.4.12
+    sha: v3.4.13
     hooks:
     -   id: ansible-lint
         files: tests/playbook.yml

.travis.yml

@@ -9,7 +9,6 @@ env:
         - VBOX_MEMORY=2048
         - VBOX_HWVIRTEX=off
     matrix:
-        - TOXENV=pre-commit
         - TOXENV=openbsd60
         - TOXENV=xenial
         - TOXENV=trusty
@@ -17,11 +16,7 @@ env:
         - &stretch TOXENV=stretch
         - &jessie TOXENV=jessie
         - TOXENV=wheezy
-matrix:
-    fast_finish: True
-    allow_failures:
-        - env: *stretch
-        - env: *jessie
+
 cache:
   - pip
   - directories:
@@ -32,7 +27,7 @@ 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 tox-travis | cat
+  - &pip_install pip install tox-travis | cat
 
 script:
   - travis_wait 45 tox
@@ -41,3 +36,14 @@ 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

Jenkinsfile

+/*
+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'
+        }
+    }
+}

molecule.yml

@@ -29,7 +29,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

tests/requirements.txt

-ansible==2.3.0.0
-testinfra==1.6.0
-molecule==1.24.0
-ansible-lint==3.4.12
-python-vagrant==0.5.14
+ansible==2.3.1.0
+testinfra==1.6.4
+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.3

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'

tox.ini

@@ -24,3 +24,8 @@ 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