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

Merge branch 'master' into feature/jenkinsfile

parents 5c22a3a9 a7142994
Branches
No related tags found
No related merge requests found
--- ---
language: python language: python
python: "2.7" python: ["2.7", "3.5"]
dist: trusty dist: trusty
sudo: false sudo: True
group: beta group: beta
services: [docker] 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: cache:
- pip - pip
- directories: - directories:
- $HOME/.pre-commit - $HOME/.pre-commit
install: 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 - pip install -r tests/requirements.txt | cat
- ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
- molecule dependency - molecule dependency
script: script:
- pre-commit run --all-files - pre-commit run --all-files
- molecule test --driver docker - molecule test --driver $driver --platform $platform
notifications: notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/ webhooks: https://galaxy.ansible.com/api/v1/notifications/
......
...@@ -13,20 +13,34 @@ vagrant: ...@@ -13,20 +13,34 @@ vagrant:
providers: providers:
- name: virtualbox - name: virtualbox
type: virtualbox type: virtualbox
options:
cpus: 1
platforms: platforms:
- name: openbsd - name: openbsd60
box: kaorimatz/openbsd-6.0-amd64 box: fnichol/openbsd-6.0-i386
- name: openbsd59
box: fnichol/openbsd-5.9-i386
- name: xenial - name: xenial
box: ubuntu/xenial64 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:
append_platform_to_hostname: yes append_platform_to_hostname: yes
raw_config_args: raw_config_args:
- 'vm.synced_folder ".", "/vagrant", disabled: true' - 'vm.synced_folder ".", "/vagrant", disabled: true'
- 'vbguest.auto_update = false' - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
- 'landrush.enabled = false' - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
- 'landrush_ip.override = false' - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
- |
vm.provider "virtualbox" do |v|
v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
end
docker: docker:
containers: containers:
......
...@@ -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]
...@@ -8,6 +8,5 @@ ...@@ -8,6 +8,5 @@
roles: [debian-bootstrap] roles: [debian-bootstrap]
- hosts: all - hosts: all
strategy: free
roles: roles:
- role: example - role: example
ansible==2.2.0.0 ansible==2.2.0.0
testinfra==1.4.5 testinfra==1.5.1
molecule==1.17.0 molecule==1.17.3
ansible-lint==3.4.9 ansible-lint==3.4.9
pre-commit==0.9.4 pre-commit==0.10.1
piprot==0.9.7 piprot==0.9.7
python-vagrant==0.5.14 python-vagrant==0.5.14
docker-py==1.10.6 docker-py==1.10.6
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment