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 13771c225e1..2037b410e09 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 f30d4cbbb91..6b08cfc1499 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -304,26 +304,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 <