Skip to content
Snippets Groups Projects
Commit a7142994 authored by nimrod's avatar nimrod
Browse files

Merge branch 'feature/platforms'

# Conflicts:
#	.travis.yml
parents e1804d8d 72c3a168
No related branches found
No related tags found
No related merge requests found
...@@ -6,15 +6,27 @@ sudo: True ...@@ -6,15 +6,27 @@ sudo: True
group: beta group: beta
services: [docker] services: [docker]
env: env:
- platform: openbsd - platform: openbsd60
driver: vagrant
- platform: openbsd59
driver: vagrant driver: vagrant
- platform: xenial - platform: xenial
driver: vagrant driver: vagrant
- platform: trusty
driver: vagrant
- platform: jessie
driver: vagrant
- platform: wheezy
driver: vagrant
- driver: docker - driver: docker
platform: all platform: all
matrix: matrix:
fast_finish: True
allow_failures: allow_failures:
- python: "3.5" - python: "3.5"
- env: platform=openbsd59 driver=vagrant
- env: platform=jessie driver=vagrant
- env: platform=wheezy driver=vagrant
cache: cache:
- pip - pip
- directories: - directories:
......
...@@ -16,10 +16,18 @@ vagrant: ...@@ -16,10 +16,18 @@ vagrant:
options: options:
cpus: 1 cpus: 1
platforms: platforms:
- name: openbsd - name: openbsd60
box: fnichol/openbsd-6.0-i386 box: fnichol/openbsd-6.0-i386
- name: openbsd59
box: fnichol/openbsd-5.9-i386
- name: xenial - name: xenial
box: ubuntu/xenial32 box: ubuntu/xenial32
- name: trusty
box: ubuntu/trusty32
- name: jessie
box: debian/jessie32
- name: wheezy
box: debian/wheezy32
instances: instances:
- name: example - name: example
options: options:
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
assert: assert:
that: that:
- ansible_os_family in ['OpenBSD', 'Debian'] - 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']
--- ---
- hosts: example-openbsd - hosts: example-openbsd*
gather_facts: false gather_facts: false
roles: [openbsd-bootstrap] roles: [openbsd-bootstrap]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment