Commit a7142994 authored by nimrod's avatar nimrod
Browse files

Merge branch 'feature/platforms' 

# Conflicts:
#	.travis.yml
parents e1804d8d 72c3a168

.travis.yml

+13 −1
Original line number Diff line number Diff line
@@ -6,15 +6,27 @@ sudo: True 
group: beta

services: [docker]

env:

    - platform: openbsd

    - 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:

molecule.yml

+9 −1
Original line number Diff line number Diff line
@@ -16,10 +16,18 @@ vagrant: 
    options:

        cpus: 1

  platforms:

  - name: openbsd

  - name: openbsd60

    box: fnichol/openbsd-6.0-i386

  - name: openbsd59

    box: fnichol/openbsd-5.9-i386

  - name: xenial

    box: ubuntu/xenial32

  - name: trusty

    box: ubuntu/trusty32

  - name: jessie

    box: debian/jessie32

  - name: wheezy

    box: debian/wheezy32

  instances:

  - name: example

    options:

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

- hosts: example-openbsd

- hosts: example-openbsd*

  gather_facts: false

  roles: [openbsd-bootstrap]