From ab4a65c10a526356c7e3ff0326b55556e99a43df Mon Sep 17 00:00:00 2001
From: Joe Finney <spxtr@google.com>
Date: Tue, 21 Jun 2016 15:58:34 -0700
Subject: [PATCH] Remove all traces of travis.

---
 .travis.yml                 |  5 -----
 docs/devel/pull-requests.md |  2 +-
 hack/lib/golang.sh          | 19 +++++++------------
 hack/test-cmd.sh            |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b9cd664458c..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: bash
-
-script:
-    - echo "Travis is disabled on master. See issue 23611."
-    - echo "https://github.com/kubernetes/kubernetes/issues/23611"
diff --git a/docs/devel/pull-requests.md b/docs/devel/pull-requests.md
index f45e9b40418..e31dc94765b 100644
--- a/docs/devel/pull-requests.md
+++ b/docs/devel/pull-requests.md
@@ -60,7 +60,7 @@ Either the [on call](on-call-rotations.md) manually or the [github "munger"](htt
 There are several requirements for the submit-queue to work:
 * Author must have signed CLA ("cla: yes" label added to PR)
 * No changes can be made since last lgtm label was applied
-* k8s-bot must have reported the GCE E2E build and test steps passed (Travis, Jenkins unit/integration, Jenkins e2e)
+* k8s-bot must have reported the GCE E2E build and test steps passed (Jenkins unit/integration, Jenkins e2e)
 
 Additionally, for infrequent or new contributors, we require the on call to apply the "ok-to-merge" label manually.  This is gated by the [whitelist](https://github.com/kubernetes/contrib/blob/master/mungegithub/whitelist.txt).
 
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index fbbf34b4de5..07ec2661136 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -300,26 +300,21 @@ EOF
     return 2
   fi
 
-  # Travis continuous build uses a head go release that doesn't report
-  # a version number, so we skip this check on Travis.  It's unnecessary
-  # there anyway.
-  if [[ "${TRAVIS:-}" != "true" ]]; then
-    local go_version
-    go_version=($(go version))
-    if [[ "${go_version[2]}" < "go1.6" && "${go_version[2]}" != "devel" ]]; then
-      kube::log::usage_from_stdin <<EOF
+  local go_version
+  go_version=($(go version))
+  if [[ "${go_version[2]}" < "go1.6" && "${go_version[2]}" != "devel" ]]; then
+    kube::log::usage_from_stdin <<EOF
 Detected go version: ${go_version[*]}.
 Kubernetes requires go version 1.6 or greater.
 Please install Go version 1.6 or later.
 EOF
-      return 2
-    fi
+    return 2
   fi
 }
 
 # kube::golang::setup_env will check that the `go` commands is available in
-# ${PATH}. If not running on Travis, it will also check that the Go version is
-# good enough for the Kubernetes build.
+# ${PATH}. It will also check that the Go version is good enough for the
+# Kubernetes build.
 #
 # Inputs:
 #   KUBE_EXTRA_GOPATH - If set, this is included in created GOPATH
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index 78ae3843d05..0253b6e706f 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This command checks that the built commands can function together for
-# simple scenarios.  It does not require Docker so it can run in travis.
+# simple scenarios.  It does not require Docker.
 
 set -o errexit
 set -o nounset