Skip to content
Snippets Groups Projects
Commit 423f342a authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
parents 8dda4776 73483850
Branches
No related tags found
No related merge requests found
......@@ -9,3 +9,4 @@ __pycache__
.vagrant/
*.log
*.retry
.tox
- repo: https://github.com/pre-commit/pre-commit-hooks
sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469
sha: v0.7.1
hooks:
- id: check-added-large-files
- id: check-json
......@@ -9,27 +9,15 @@
- id: flake8
- id: check-symlinks
- repo: https://github.com/adarnimrod/ansible-pre-commit.git
sha: 0fadd691465b97db8992cfc66650f630e433324b
sha: v0.6.0
hooks:
- id: ansible-syntax-check
always_run: true
files: tests/playbook.yml
args:
- tests/playbook.yml
- repo: https://github.com/willthames/ansible-lint
sha: 959ab0f525e9abb19cf75f34381015cf33695f61
sha: v3.4.12
hooks:
- id: ansible-lint
always_run: true
files: tests/playbook.yml
args:
- tests/playbook.yml
- repo: local
- repo: https://github.com/adarnimrod/python-pre-commit.git
sha: v0.2.0
hooks:
- id: piprot
name: piprot
description: Check up-to-date Python requirements
language: system
entry: piprot --quiet --outdated tests/requirements.txt
files: requirements.txt
always_run: true
......@@ -2,23 +2,41 @@
language: python
python: "2.7"
dist: trusty
sudo: false
sudo: True
group: beta
services: [docker]
env:
global:
- VBOX_MEMORY=2048
matrix:
- TOXENV=pre-commit
- TOXENV=openbsd60
- TOXENV=xenial
- TOXENV=trusty
- TOXENV=precise
- &stretch TOXENV=stretch
- &jessie TOXENV=jessie
- TOXENV=wheezy
matrix:
fast_finish: True
allow_failures:
- env: *stretch
- env: *jessie
cache:
- pip
- directories:
- $HOME/.pre-commit
install:
- pip install -r tests/requirements.txt | cat
- ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
- molecule dependency
- sudo apt-get update
- sudo apt-get install -y linux-headers-$(uname -r) virtualbox
- wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb
- sudo dpkg -i vagrant_1.9.1_x86_64.deb
- pip install tox-travis | cat
script:
- pre-commit run --all-files
- molecule test --driver docker
- travis_wait 45 tox
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
email: false
on_failure: never
......@@ -29,22 +29,9 @@ 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:
.. code:: shell
pip install -r tests/requirements.txt
ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
molecule dependency
To run the full test suite:
.. code:: shell
pre-commit run --all-files
molecule test --platform all
Testing requires Python 2.7, Tox, Vagrant and Virtualbox. To test simply run
:code:`tox`. `Pre-commit <http://pre-commit.com/>`_ is also setup for this
project.
License
-------
......
......@@ -3,7 +3,7 @@ galaxy_info:
description: Install PHP5 (cli, not mod-php nor fpm)
company: Shore technologies
license: MIT
min_ansible_version: 2.0
min_ansible_version: 2.3
platforms:
- name: Debian
versions:
......
......@@ -5,6 +5,10 @@ ansible:
diff: True
config_file: ../ansible.cfg
molecule:
ignore_paths:
- .tox
dependency:
name: galaxy
requirements_file: tests/requirements.yml
......@@ -13,36 +17,31 @@ vagrant:
providers:
- name: virtualbox
type: virtualbox
options:
cpus: 1
platforms:
- name: openbsd
box: kaorimatz/openbsd-6.0-amd64
- name: debian
box: debian/jessie64
- name: openbsd60
box: fnichol/openbsd-6.0-i386
- name: trusty
box: ubuntu/trusty32
- name: precise
box: hashicorp/precise32
- name: jessie
box: deb/jessie-i386
- name: wheezy
box: bmorg/debian-wheezy-i386
instances:
- name: php5
options:
append_platform_to_hostname: yes
raw_config_args:
- 'vm.boot_timeout = 600'
- 'vm.synced_folder ".", "/vagrant", disabled: true'
- 'vbguest.auto_update = false'
- 'landrush.enabled = false'
- 'landrush_ip.override = false'
docker:
containers:
- name: php5-jessie
image: debian
image_version: jessie
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: php5-trusty
image: ubuntu
image_version: trusty
environment:
DEBIAN_FRONTEND: noninteractive
- 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
- 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
- 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
- |
vm.provider "virtualbox" do |v|
v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY')
end
---
- hosts: php5-openbsd
- hosts: php5-openbsd*
gather_facts: false
roles: [openbsd-bootstrap]
roles:
- openbsd-bootstrap
- role: users
users: []
users_use_sudo: True
users_lock_root_ssh: False
- hosts: php5-xenial
- hosts: [php5-xenial, php5-wheezy]
gather_facts: false
roles: [debian-bootstrap]
roles:
- debian-bootstrap
- role: users
users: []
users_use_sudo: True
users_lock_root_ssh: False
- hosts: all
strategy: free
roles:
- role: php5
ansible==2.2.0.0
testinfra==1.4.5
molecule==1.17.0
ansible-lint==3.4.9
pre-commit==0.9.4
piprot==0.9.7
ansible==2.3.0.0
testinfra==1.5.5
molecule==1.23.2
ansible-lint==3.4.12
python-vagrant==0.5.14
docker-py==1.10.6
netaddr==0.7.18
passlib==1.7.0
bcrypt==3.1.2
netaddr==0.7.19
passlib==1.7.1
bcrypt==3.1.3
......@@ -3,3 +3,5 @@
name: openbsd-bootstrap
- src: adarnimrod.debian-bootstrap
name: debian-bootstrap
- src: adarnimrod.users
name: users
tox.ini 0 → 100644
[tox]
skip_install = True
skipsdist = True
envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy
[testenv]
envdir = {toxinidir}/.tox
deps = -rtests/requirements.txt
passenv = HOME VBOX* ANSIBLE_*
whitelist_externals =
sh
commands =
sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"
molecule test --platform {envname}
[testenv:pre-commit]
envdir = {toxinidir}/.tox
deps =
-rtests/requirements.txt
pre-commit
passenv = HOME VBOX* ANSIBLE_*
whitelist_externals =
sh
commands =
sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"
molecule dependency
pre-commit run --all-files
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment