Commit 7a3506a3 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/jenkinsfile

parents 5c22a3a9 a7142994

.travis.yml

+29 −3
Original line number Diff line number Diff line 
---

language: python

python: "2.7"

python: ["2.7", "3.5"]

dist: trusty

sudo: false

sudo: True

group: beta

services: [docker]

env:

    - platform: openbsd60

      driver: vagrant

    - platform: openbsd59

      driver: vagrant

    - platform: xenial

      driver: vagrant

    - platform: trusty

      driver: vagrant

    - platform: jessie

      driver: vagrant

    - platform: wheezy

      driver: vagrant

    - driver: docker

      platform: all

matrix:

    fast_finish: True

    allow_failures:

        - python: "3.5"

        - env: platform=openbsd59 driver=vagrant

        - env: platform=jessie driver=vagrant

        - env: platform=wheezy driver=vagrant

cache:

  - pip

  - directories:

      - $HOME/.pre-commit



install:

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

  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

  - molecule dependency



script:

  - pre-commit run --all-files

  - molecule test --driver docker

  - molecule test --driver $driver --platform $platform



notifications:

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

molecule.yml

+20 −6
Original line number Diff line number Diff line
@@ -13,20 +13,34 @@ vagrant: 
  providers:

  - name: virtualbox

    type: virtualbox

    options:

        cpus: 1

  platforms:

  - name: openbsd

    box: kaorimatz/openbsd-6.0-amd64

  - name: openbsd60

    box: fnichol/openbsd-6.0-i386

  - name: openbsd59

    box: fnichol/openbsd-5.9-i386

  - name: xenial

    box: ubuntu/xenial64

    box: ubuntu/xenial32

  - name: trusty

    box: ubuntu/trusty32

  - name: jessie

    box: debian/jessie32

  - name: wheezy

    box: debian/wheezy32

  instances:

  - name: example

    options:

        append_platform_to_hostname: yes

  raw_config_args:

  - 'vm.synced_folder ".", "/vagrant", disabled: true'

  - 'vbguest.auto_update = false'

  - 'landrush.enabled = false'

  - 'landrush_ip.override = false'

  - '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"]

      end



docker:

  containers:

tasks/main.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
  assert:

    that:

        - ansible_os_family in ['OpenBSD', 'Debian']

        - ansible_distribution_release in ['6.0', 'xenial']
 
        - ansible_distribution_release in ['6.0', '5.9', 'xenial', 'trusty', 'jessie', 'wheezy']

tests/playbook.yml

+1 −2
Original line number Diff line number Diff line 
---

- hosts: example-openbsd

- hosts: example-openbsd*

  gather_facts: false

  roles: [openbsd-bootstrap]
@@ -8,6 +8,5 @@ 
  roles: [debian-bootstrap]



- hosts: all

  strategy: free

  roles:

    - role: example

tests/requirements.txt

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

testinfra==1.4.5

molecule==1.17.0

testinfra==1.5.1

molecule==1.17.3

ansible-lint==3.4.9

pre-commit==0.9.4

pre-commit==0.10.1

piprot==0.9.7

python-vagrant==0.5.14

docker-py==1.10.6