diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 09c5ff92617f961983dba06904ed6ac692ea2bec..1c367af8565706e3bae4c4b6b210c98468e1084d 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 diff --git a/.travis.yml b/.travis.yml index 14032a04828696b90bdcb20c0d1320460a9e7958..fbf0fd83933fdaaa25a238b242221c5f3df5b2d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,18 +4,21 @@ python: ["2.7", "3.5"] dist: trusty sudo: True group: beta -services: [docker] env: - platform: openbsd60 - driver: vagrant - - &openbsd59 platform=openbsd59 driver=vagrant - - driver: docker - platform: all + - &openbsd59 platform=openbsd59 + - platform: xenial + - platform: trusty + - platform: precise + - &stretch platform=stretch + - platform: jessie + - platform: wheezy matrix: fast_finish: True allow_failures: - python: "3.5" - env: *openbsd59 + - env: *stretch cache: - pip - directories: @@ -32,7 +35,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 affdbc56f86d0fc81cb89257223013ba9a98c21f..5b6a09c93374448d86a226edf69471913ae6734c 100644 --- a/README.rst +++ b/README.rst @@ -30,9 +30,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/molecule.yml b/molecule.yml index bbee0b115ccd4604b12086c62dda14d48913fd26..d1906924e949537f8ecbcaefaa98a3d145f926d8 100644 --- a/molecule.yml +++ b/molecule.yml @@ -26,6 +26,8 @@ vagrant: box: ubuntu/trusty32 - name: precise box: hashicorp/precise32 + - name: stretch + box: remram/debian-9-i386 - name: jessie box: deb/jessie-i386 - name: wheezy @@ -43,48 +45,3 @@ vagrant: vm.provider "virtualbox" do |v| v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"] end - -docker: - containers: - - name: gitreceive-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: gitreceive-trusty - image: ubuntu-upstart - image_version: trusty - command: /sbin/init - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: gitreceive-precise - image: ubuntu - image_version: precise - environment: - DEBIAN_FRONTEND: noninteractive - container: docker - - name: gitreceive-jessie - image: debian - image_version: jessie - command: /sbin/init - cap_add: - - SYS_ADMIN - 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: gitreceive-wheezy - image: debian - image_version: wheezy - environment: - DEBIAN_FRONTEND: noninteractive - container: docker diff --git a/tasks/main.yml b/tasks/main.yml index effc893bf45f5ea50974e4e68d42efa368de1d39..e4ab11fcfbbb375d5dbf3bd1d356d8f1f7ff03e7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,7 +4,7 @@ - name: Assertions assert: that: - - ansible_os_family in ['Debian', 'OpenBSD'] + - ansible_os_family in ['OpenBSD', 'Debian'] - gitreceive_public_keys is iterable - name: APT install prequisites diff --git a/tests/requirements.txt b/tests/requirements.txt index f4cbfddce2bfb1c4aed0a59c2b32325c4f83b433..1ba83f41ed11fc444adf472873e544f97efe657e 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,7 +5,6 @@ ansible-lint==3.4.10 pre-commit==0.11.0 piprot==0.9.7 python-vagrant==0.5.14 -docker-py==1.10.6 netaddr==0.7.19 passlib==1.7.0 bcrypt==3.1.2