Commit fa965bc9 authored by nimrod's avatar nimrod
Browse files

- Stop testing with Docker containers, they're only a good fit for a very...

- Stop testing with Docker containers, they're only a good fit for a very limited use (cli applications, not services or system-level) and the speed of testing doesn't justify the work needed.
parent e9dd3345
Loading
Loading
Loading
Loading
+5 −11
Original line number Diff line number Diff line
@@ -4,20 +4,14 @@ python: ["2.7", "3.5"]
dist: trusty
sudo: True
group: beta
services: [docker]
env:
    - platform: openbsd60
      driver: vagrant
    - &openbsd59 platform=openbsd59 driver=vagrant
    - &openbsd59 platform=openbsd59
    - platform: xenial
      driver: vagrant
    - platform: trusty
      driver: vagrant
    - &precise platform=precise driver=vagrant
    - &jessie platform=jessie driver=vagrant
    - &wheezy platform=wheezy driver=vagrant
    - driver: docker
      platform: all
    - platform: precise
    - platform: jessie
    - platform: wheezy
matrix:
    fast_finish: True
    allow_failures:
@@ -39,7 +33,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/
+2 −3
Original line number Diff line number Diff line
@@ -31,9 +31,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

+0 −44
Original line number Diff line number Diff line
@@ -43,47 +43,3 @@ vagrant:
      vm.provider "virtualbox" do |v|
        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
      end

docker:
  containers:
  - name: example-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: example-trusty
    image: ubuntu-upstart
    image_version: trusty
    environment:
        DEBIAN_FRONTEND: noninteractive
        container: docker
  - name: example-precise
    image: ubuntu
    image_version: precise
    environment:
        DEBIAN_FRONTEND: noninteractive
        container: docker
  - name: example-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: example-wheezy
    image: debian
    image_version: wheezy
    environment:
        DEBIAN_FRONTEND: noninteractive
        container: docker
+0 −1
Original line number Diff line number Diff line
@@ -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