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

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ __pycache__ 
.vagrant/

*.log

*.retry

.tox

.pre-commit-config.yaml

+5 −17
Original line number Diff line number Diff line 
-   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

.travis.yml

+25 −7
Original line number Diff line number Diff line
@@ -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

README.rst

+3 −16
Original line number Diff line number Diff line
@@ -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

-------

meta/main.yml

+1 −1
Original line number Diff line number Diff line
@@ -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: