Skip to content
Snippets Groups Projects
Commit 325166f0 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	.travis.yml
#	molecule.yml
#	tasks/main.yml
parents f936dae0 c508b943
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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/
......
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment