From fa965bc9c05e6d7062b929f5650b80623f312fe6 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 21 Jan 2017 23:27:08 +0200
Subject: [PATCH] - 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.
---
.travis.yml | 16 +++++----------
README.rst | 5 ++---
molecule.yml | 44 ------------------------------------------
tests/requirements.txt | 1 -
4 files changed, 7 insertions(+), 59 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4405a9a..182a7b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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/
diff --git a/README.rst b/README.rst
index edf5c47..9336623 100644
--- a/README.rst
+++ b/README.rst
@@ -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
diff --git a/molecule.yml b/molecule.yml
index 98579ff..b372e85 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -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
diff --git a/tests/requirements.txt b/tests/requirements.txt
index f4cbfdd..1ba83f4 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
--
GitLab