Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -4,20 +4,14 @@ python: ["2.7", "3.5"] ...@@ -4,20 +4,14 @@ python: ["2.7", "3.5"]
dist: trusty dist: trusty
sudo: True sudo: True
group: beta group: beta
services: [docker]
env: env:
- platform: openbsd60 - platform: openbsd60
driver: vagrant - &openbsd59 platform=openbsd59
- &openbsd59 platform=openbsd59 driver=vagrant
- platform: xenial - platform: xenial
driver: vagrant
- platform: trusty - platform: trusty
driver: vagrant - platform: precise
- &precise platform=precise driver=vagrant - platform: jessie
- &jessie platform=jessie driver=vagrant - platform: wheezy
- &wheezy platform=wheezy driver=vagrant
- driver: docker
platform: all
matrix: matrix:
fast_finish: True fast_finish: True
allow_failures: allow_failures:
...@@ -39,7 +33,7 @@ install: ...@@ -39,7 +33,7 @@ install:
script: script:
- pre-commit run --all-files - pre-commit run --all-files
- molecule test --driver $driver --platform $platform - molecule test --platform $platform
notifications: notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/ webhooks: https://galaxy.ansible.com/api/v1/notifications/
......
...@@ -31,9 +31,8 @@ See :code:`tests/playbook.yml`. ...@@ -31,9 +31,8 @@ See :code:`tests/playbook.yml`.
Testing Testing
------- -------
Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox. Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python
Install the Python dependencies, dependent roles and roles required for dependencies, dependent roles and roles required for testing:
testing:
.. code:: shell .. code:: shell
......
...@@ -43,47 +43,3 @@ vagrant: ...@@ -43,47 +43,3 @@ vagrant:
vm.provider "virtualbox" do |v| vm.provider "virtualbox" do |v|
v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"] v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
end 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
...@@ -5,7 +5,6 @@ ansible-lint==3.4.10 ...@@ -5,7 +5,6 @@ ansible-lint==3.4.10
pre-commit==0.11.0 pre-commit==0.11.0
piprot==0.9.7 piprot==0.9.7
python-vagrant==0.5.14 python-vagrant==0.5.14
docker-py==1.10.6
netaddr==0.7.19 netaddr==0.7.19
passlib==1.7.0 passlib==1.7.0
bcrypt==3.1.2 bcrypt==3.1.2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment