diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 233bc80d8f4b0a2ed98f97e33a6269dd6ef0d882..a1fa490069bae414848cd9cc6b5f2450d108d638 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ - id: flake8 - id: check-symlinks - repo: https://github.com/adarnimrod/ansible-pre-commit.git - sha: 0fadd691465b97db8992cfc66650f630e433324b + sha: v0.5.0 hooks: - id: ansible-syntax-check always_run: true @@ -30,6 +30,6 @@ name: piprot description: Check up-to-date Python requirements language: system - entry: piprot --quiet --outdated tests/requirements.txt + entry: piprot --outdated tests/requirements.txt files: requirements.txt always_run: true diff --git a/.travis.yml b/.travis.yml index 76ea95253a9b6231e349b07ad79b03b626e31028..160564e72d132cf7953cfc6fb69eae200c3329f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,17 @@ --- language: python -python: ["2.7", "3.4"] +python: ["2.7", "3.5"] dist: trusty sudo: True group: beta env: - platform: openbsd60 - driver: vagrant - - &openbsd59 platform=openbsd59 driver=vagrant + - &openbsd59 platform=openbsd59 - platform: openbsd56 - driver: vagrant matrix: fast_finish: True allow_failures: - - python: "3.4" + - python: "3.5" - env: *openbsd59 cache: - pip @@ -31,7 +29,7 @@ install: script: - pre-commit run --all-files - - molecule test --driver $driver --platform $platform + - molecule test --platform $platform notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/README.rst b/README.rst index f922881fe687ec1252230a132efad30a2648f95d..65891aa02a92d292d59509b4a4807933e2721658 100644 --- a/README.rst +++ b/README.rst @@ -29,9 +29,8 @@ 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: +Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python +dependencies, dependent roles and roles required for testing: .. code:: shell diff --git a/tests/playbook.yml b/tests/playbook.yml index 4afcf22a28bd3c0a4222ebd104ee6cd489225cfa..b06f5a2ba7c3fe2bfd88d19eaae592dd9f56176f 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -4,12 +4,6 @@ roles: - role: openbsd-bootstrap post_tasks: - - name: Test gathering facts - setup: - - - name: Test ping - ping: - - name: Test task with an unprivileged user ignore_errors: '{{ ansible_check_mode }}' become: True diff --git a/tests/requirements.txt b/tests/requirements.txt index 76ed1468af88ae4265729cdb4fd65dff655e719d..e68ec5f8e882cf75301f59808bcfcb520fcecaea 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,11 +1,10 @@ ansible==2.2.1.0 -testinfra==1.5.2 -molecule==1.18.0 +testinfra==1.5.3 +molecule==1.19.1 ansible-lint==3.4.10 -pre-commit==0.10.1 +pre-commit==0.12.2 piprot==0.9.7 python-vagrant==0.5.14 -docker-py==1.10.6 netaddr==0.7.19 -passlib==1.7.0 +passlib==1.7.1 bcrypt==3.1.2 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