Merge pull request ansible#16159 from mattclay/detect-shippable

Detect use of Travis tests on Shippable.
bigjools · Jun 6, 2016 · 1b3d6df · 1b3d6df
2 parents a9aab76 + 0359714
commit 1b3d6df
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+if [ "${SHIPPABLE}" = "true" ]; then
+    echo "It appears this job is running on Shippable instead of Travis."
+    if [ "${IS_PULL_REQUEST}" = "true" ]; then
+        echo "Please rebase the branch used for this pull request."
+    else
+        echo "This branch needs to be updated to work with Shippable."
+    fi
+    exit 1
+fi
+
 set -e
 set -u
 set -x