diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bd9a4d714377ea51d2cd14419ae059cc9307b5d5..13dbdf1997b4d7115d467b019b31712b08540e26 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/.travis.yml b/.travis.yml index 1bbb982e61430523a834ed3fa375eb2e946f63c9..e74e1eaf45ac4f6d452a0e5b99bd8e77b5b0605d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,9 @@ env: - VBOX_MEMORY=2048 - VBOX_HWVIRTEX=off matrix: - - TOXENV=pre-commit - TOXENV=trusty - &jessie TOXENV=jessie -matrix: - fast_finish: True - allow_failures: - - env: *jessie + cache: - pip - directories: @@ -26,7 +22,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 @@ -35,3 +31,12 @@ notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ email: false on_failure: never + +matrix: + fast_finish: True + 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/molecule.yml b/molecule.yml index 423bc098e2bc819d17f2e920de810ce3bfe8ff31..d4344a39cbfce455c3a9a93b254d0d51b6054bfa 100644 --- a/molecule.yml +++ b/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 diff --git a/tests/requirements.txt b/tests/requirements.txt index 1186c3351818f7fb407e6f449cebeea81093c7a9..032b0dad72dde2847566f1a537e6939c4be2e2d6 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,8 +1,8 @@ -ansible==2.3.0.0 -testinfra==1.5.5 -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 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 index d6c30800493a9e1098e14488677798b5b7acf0ab..e7f5cc2972f65fc4b46711198f04d04678ea1e08 100644 --- a/tox.ini +++ b/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