Merge pull request #27816 from spxtr/no-travis

Automatic merge from submit-queue

Remove all traces of travis.
This commit is contained in:
k8s-merge-robot 2016-06-28 03:53:34 -07:00 committed by GitHub
commit 337805d1a7
4 changed files with 9 additions and 19 deletions

View File

@ -1,5 +0,0 @@
language: bash
script:
- echo "Travis is disabled on master. See issue 23611."
- echo "https://github.com/kubernetes/kubernetes/issues/23611"

View File

@ -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: There are several requirements for the submit-queue to work:
* Author must have signed CLA ("cla: yes" label added to PR) * Author must have signed CLA ("cla: yes" label added to PR)
* No changes can be made since last lgtm label was applied * 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). 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).

View File

@ -304,26 +304,21 @@ EOF
return 2 return 2
fi fi
# Travis continuous build uses a head go release that doesn't report local go_version
# a version number, so we skip this check on Travis. It's unnecessary go_version=($(go version))
# there anyway. if [[ "${go_version[2]}" < "go1.6" && "${go_version[2]}" != "devel" ]]; then
if [[ "${TRAVIS:-}" != "true" ]]; 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[*]}. Detected go version: ${go_version[*]}.
Kubernetes requires go version 1.6 or greater. Kubernetes requires go version 1.6 or greater.
Please install Go version 1.6 or later. Please install Go version 1.6 or later.
EOF EOF
return 2 return 2
fi
fi fi
} }
# kube::golang::setup_env will check that the `go` commands is available in # 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 # ${PATH}. It will also check that the Go version is good enough for the
# good enough for the Kubernetes build. # Kubernetes build.
# #
# Inputs: # Inputs:
# KUBE_EXTRA_GOPATH - If set, this is included in created GOPATH # KUBE_EXTRA_GOPATH - If set, this is included in created GOPATH

View File

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
# This command checks that the built commands can function together for # 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 errexit
set -o nounset set -o nounset