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..6267f4aff7cbc582045c6b1deb2d7998ace5ccfe 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.9.3 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.7.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.15 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 780031a5e0f3fec672214a0361570e9935f32ca1..f8d9b4ccffbf43047d56cf514fadac92e6ac2b35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,50 @@ --- language: python -python: ["2.7", "3.4"] +python: "2.7" dist: trusty sudo: True group: beta -services: [docker] +env: + global: + - VBOX_MEMORY=2048 + - VBOX_HWVIRTEX=off + matrix: + - TOXENV=openbsd60 + - TOXENV=xenial + - TOXENV=trusty + - TOXENV=precise + - &stretch TOXENV=stretch + - &jessie TOXENV=jessie + - TOXENV=wheezy + cache: - pip - directories: - $HOME/.pre-commit -matrix: - fast_finish: True - allow_failures: - - python: "3.4" + - $HOME/.vagrant.d/boxes install: - 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 -r tests/requirements.txt | cat - - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles - - molecule dependency - - for image in ubuntu:precise ubuntu:trusty ubuntu:xenial debian:wheezy debian:jessie debian:stretch; do docker pull $image; done + - &pip_install pip install tox-travis | cat script: - - pre-commit run --all-files - - molecule test --driver docker + - 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 438cf0501efc26199b84ea7041d947c0f1ae057f..eaf45fa944f289d23fdf68e4e4ae44b96b81736d 100644 --- a/README.rst +++ b/README.rst @@ -30,22 +30,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/meta/main.yml b/meta/main.yml index f811fc64be435cdfbf1fa5caa78bafdd44e9e8cf..84937d68b056510affa186b6a64112ae7c83daf8 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,15 +3,17 @@ galaxy_info: description: Role to bootstrap a Debian or derivative instance (allow Ansible to provision the instance). company: Shore technologies. license: MIT - min_ansible_version: 2.0 + min_ansible_version: 2.3 platforms: - - name: Debian - versions: - - jessie - - stretch - name: Ubuntu versions: - - trusty - - xenial + - xenial + - trusty + - precise + - name: Debian + versions: + - stretch + - jessie + - wheezy galaxy_tags: ['Debian', 'bootstrap', 'Ubuntu'] dependencies: [] diff --git a/molecule.yml b/molecule.yml index 20255d8dd4219dab7f28e0fb049d5a003ca95b75..49cc086c33121e752ed92f5e150bc1f010aa0907 100644 --- a/molecule.yml +++ b/molecule.yml @@ -5,6 +5,13 @@ ansible: diff: True config_file: ../ansible.cfg +molecule: + ignore_paths: + - .tox + +dependency: + name: galaxy + requirements_file: tests/requirements.yml vagrant: providers: @@ -13,71 +20,32 @@ vagrant: options: cpus: 1 platforms: + - name: openbsd60 + box: fnichol/openbsd-6.0-i386 - name: xenial box: ubuntu/xenial32 - name: trusty box: ubuntu/trusty32 - - name: jessie - box: debian/jessie32 - - name: wheezy - box: debian/wheezy32 - name: precise box: hashicorp/precise32 + - name: stretch + box: koalephant/debian9-i386 + - name: jessie + box: deb/jessie-i386 + - name: wheezy + box: bmorg/debian-wheezy-i386 instances: - name: debian-bootstrap options: append_platform_to_hostname: yes raw_config_args: + - 'vm.boot_timeout = 600' - 'vm.synced_folder ".", "/vagrant", disabled: true' - '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.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 - -docker: - build_image: False - containers: - - name: debian-bootstrap-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: debian-bootstrap-trusty - image: ubuntu - image_version: trusty - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: debian-bootstrap-precise - image: ubuntu - image_version: precise - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: debian-bootstrap-jessie - image: debian - image_version: jessie - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: debian-bootstrap-stretch - image: debian - image_version: stretch - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: debian-bootstrap-wheezy - image: debian - image_version: wheezy - environment: - DEBIAN_FRONTEND: noninteractive - container: docker diff --git a/tests/playbook.yml b/tests/playbook.yml index a33b7cda606c30999a36ce0267c25d9ee4d70943..0c5c56220a85d68e0499afbb00e7de2372d29868 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -1,13 +1,23 @@ --- -- hosts: all - gather_facts: False - roles: [debian-bootstrap] - post_tasks: - - name: APT install sudo - apt: - name: sudo - state: present +- hosts: debian-bootstrap-openbsd* + gather_facts: false + roles: + - openbsd-bootstrap + - role: users + users: [] + users_use_sudo: True + users_lock_root_ssh: False + +- hosts: [debian-bootstrap-xenial, debian-bootstrap-wheezy] + gather_facts: false + roles: + - debian-bootstrap + - role: users + users: [] + users_use_sudo: True + users_lock_root_ssh: False + post_tasks: - name: Test gathering facts setup: diff --git a/tests/requirements.txt b/tests/requirements.txt index 76ed1468af88ae4265729cdb4fd65dff655e719d..1361b26d44a90352ec0160b571983c12ea0de190 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,11 +1,8 @@ -ansible==2.2.1.0 -testinfra==1.5.2 -molecule==1.18.0 -ansible-lint==3.4.10 -pre-commit==0.10.1 -piprot==0.9.7 -python-vagrant==0.5.14 -docker-py==1.10.6 +ansible==2.3.2.0 +testinfra==1.7.0 +molecule<2 +ansible-lint==3.4.15 +python-vagrant==0.5.15 netaddr==0.7.19 -passlib==1.7.0 -bcrypt==3.1.2 +passlib==1.7.1 +bcrypt==3.1.3 diff --git a/tests/requirements.yml b/tests/requirements.yml index 70716f60b9e624bc5a09442517a08667363949f4..fccce7574df98d466c55a309273c4060174e8cb0 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -3,3 +3,5 @@ name: openbsd-bootstrap - src: adarnimrod.debian-bootstrap name: debian-bootstrap +- src: adarnimrod.users + name: users diff --git a/tests/test_example.py b/tests/test_example.py index 4f4066cb7e9d60d2116f7cf9708c336a4145e9b7..3c308b7bc441b051237f60b2a935f56ce357557d 100644 --- a/tests/test_example.py +++ b/tests/test_example.py @@ -3,5 +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(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..439436b3db0f957b31e69a90179e9d3238e8d0bb --- /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 = + {[testenv]deps} + pre-commit +passenv = {[testenv]passenv} +whitelist_externals = {[testenv]whitelist_externals} +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 = {[testenv]envdir} +deps = {[testenv]deps} +passenv = {[testenv]passenv} +commands = ansible-galaxy import -v