Commit e3240875 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	.travis.yml
parents 9309f6e0 4ca4f85c

.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: v0.5.0

    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 --outdated tests/requirements.txt

        files: requirements.txt

        always_run: true

.travis.yml

+8 −4
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ dist: trusty 
sudo: True

group: beta

env:

    global:

        - VBOX_MEMORY=2048

    matrix:

        - platform: openbsd60

        - &openbsd59 platform=openbsd59

        - platform: openbsd56
@@ -29,8 +32,9 @@ install: 


script:

  - pre-commit run --all-files

  - molecule test --platform $platform

  - travis_wait 45 molecule test --platform $platform



notifications:

  webhooks: https://galaxy.ansible.com/api/v1/notifications/

  email: false

  on_failure: never

molecule.yml

+1 −0
Original line number Diff line number Diff line
@@ -31,4 +31,5 @@ vagrant: 
  - |

      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

tests/requirements.txt

+6 −7
Original line number Diff line number Diff line 
ansible==2.2.1.0

testinfra==1.5.3

molecule==1.19.3

ansible-lint==3.4.10

pre-commit==0.12.2

piprot==0.9.7

ansible==2.3.0.0

testinfra==1.5.5

molecule==1.23.2

ansible-lint==3.4.12

pre-commit==0.13.6

python-vagrant==0.5.14

netaddr==0.7.19

passlib==1.7.1

bcrypt==3.1.2
 
bcrypt==3.1.3