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

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

# Conflicts:
#	.travis.yml
parents fab0d5d2 12b78165
No related branches found
No related tags found
No related merge requests found
......@@ -9,14 +9,10 @@ env:
- VBOX_MEMORY=2048
- VBOX_HWVIRTEX=off
matrix:
- TOXENV=pre-commit
- TOXENV=xenial
- &stretch TOXENV=stretch
- &jessie TOXENV=jessie
matrix:
fast_finish: True
allow_failures:
- env: *stretch
cache:
- pip
- directories:
......@@ -27,7 +23,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
......@@ -36,3 +32,14 @@ notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
email: false
on_failure: never
matrix:
fast_finish: True
allow_failures:
- env: *stretch
include:
- env:
TOXENV: pre-commit
install:
- *pip_install
sudo: False
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment