Commit d933a8d3 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	.travis.yml
parents e758f917 12b78165

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    hooks:

    -   id: ansible-syntax-check

-   repo: https://github.com/willthames/ansible-lint

    sha: v3.4.12

    sha: v3.4.13

    hooks:

    -   id: ansible-lint

        files: tests/playbook.yml

.travis.yml

+12 −6
Original line number Diff line number Diff line
@@ -7,17 +7,14 @@ group: beta 
env:

    global:

        - VBOX_MEMORY=2048

        - VBOX_HWVIRTEX=off

    matrix:

        - TOXENV=pre-commit

        - TOXENV=openbsd60

        - TOXENV=trusty

        - TOXENV=precise

        - &jessie TOXENV=jessie

        - TOXENV=wheezy

matrix:

    fast_finish: True

    allow_failures:

        - env: *jessie



cache:

  - pip

  - directories:
@@ -28,7 +25,7 @@ install: 
  - 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

  - &pip_install pip install tox-travis | cat



script:

  - travis_wait 45 tox
@@ -37,3 +34,12 @@ notifications: 
  webhooks: https://galaxy.ansible.com/api/v1/notifications/

  email: false

  on_failure: never



matrix:

    fast_finish: True

    include:

        - env:

            TOXENV: pre-commit

          install:

              - *pip_install

          sudo: False

Jenkinsfile

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

Jenkins pipeline for testing an Ansible role.

Required software on the agent:

- Python 2.7.

- Tox.

- Vagrant.

- Virtualbox.

*/

pipeline {

    agent any

    environment {

        VBOX_HWVIRTEX       = off

    }

    stages {

        stage('install') {

            steps {

                sh 'git submodule update --init --recursive'

            }

        }

        stage('test') {

            steps {

                parallel (

                    'pre-commit': {

                        sh 'tox -e pre-commit'

                    }

                    'molecule': {

                        sh 'tox'

                    }

                )

            }

        }

    }

    post {

        success {

            sh 'tox -e import'

        }

    }

}

molecule.yml

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ vagrant: 
  - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'

  - |

      vm.provider "virtualbox" do |v|

        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]

        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", ENV['VBOX_HWVIRTEX']] if ENV.has_key?('VBOX_HWVIRTEX')

        v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY')

      end

tests/requirements.txt

+3 −3
Original line number Diff line number Diff line 
ansible==2.3.0.0

testinfra==1.5.5

testinfra==1.6.0

molecule==1.24.0

ansible-lint==3.4.12

python-vagrant==0.5.14

ansible-lint==3.4.13

python-vagrant==0.5.15

netaddr==0.7.19

passlib==1.7.1

bcrypt==3.1.3