summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2016-09-20 17:35:57 -0700
committerGitHub <noreply@github.com>2016-09-20 17:35:57 -0700
commitb7168d2ac8c21d97959c59f7ec746309160b65eb (patch)
treed23ef9f3bb0085ad949ef2ee1e9297f55d1aca60
parentc004ae578d89b1e7684de71b1e568f5ccafbd210 (diff)
downloadansible-b7168d2ac8c21d97959c59f7ec746309160b65eb.tar.gz
Remove Travis config/badge and add Shippable. (#17680)
-rw-r--r--.travis.yml40
-rw-r--r--README.md3
2 files changed, 1 insertions, 42 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c3d250b9e5..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-dist: trusty
-sudo: required
-services:
- - docker
-language: python
-matrix:
- include:
- - env: TARGET=centos6
- - env: TARGET=centos7 TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
- - env: TARGET=fedora23 TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
- - env: TARGET=fedora-rawhide TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
- - env: TARGET=ubuntu1204
- - env: TARGET=ubuntu1404
- - env: TARGET=sanity TOXENV=py26
- python: 2.6
- - env: TARGET=sanity TOXENV=py27
- python: 2.7
- - env: TARGET=sanity TOXENV=py34
- python: 3.4
- - env: TARGET=sanity TOXENV=py35
- python: 3.5
- - env: TARGET=sanity TOXENV=py24
-addons:
- apt:
- sources:
- - deadsnakes
- packages:
- - python2.4
-install:
- - pip install tox
-script:
- - ./test/utils/run_tests.sh
-notifications:
- irc:
- channels:
- - "chat.freenode.net#ansible-notices"
- on_success: change
- on_failure: always
- skip_join: true
- nick: ansibletravis
diff --git a/README.md b/README.md
index 2e1f15559d..8bb66d0749 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
[![PyPI version](https://img.shields.io/pypi/v/ansible.svg)](https://pypi.python.org/pypi/ansible)
[![PyPI downloads](https://img.shields.io/pypi/dm/ansible.svg)](https://pypi.python.org/pypi/ansible)
-[![Build Status](https://travis-ci.org/ansible/ansible.svg?branch=devel)](https://travis-ci.org/ansible/ansible)
-
+[![Build Status](https://api.shippable.com/projects/573f79d02a8192902e20e34b/badge?branch=stable-2.1)](https://app.shippable.com/projects/573f79d02a8192902e20e34b)
Ansible
=======