diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh index 6b1e63fe76b..c49c37cb9b1 100755 --- a/hack/jenkins/gotest-dockerized.sh +++ b/hack/jenkins/gotest-dockerized.sh @@ -46,4 +46,4 @@ docker run --rm=true \ -e "REPO_DIR=${REPO_DIR}" \ -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \ -i gcr.io/google_containers/kubekins-test:0.11 \ - bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh" + bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}" diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh index 7f478f82482..9bacd4696e5 100755 --- a/hack/jenkins/test-dockerized.sh +++ b/hack/jenkins/test-dockerized.sh @@ -56,8 +56,6 @@ rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated go install ./cmd/... ./hack/install-etcd.sh -./hack/verify-all.sh -v - ./hack/test-go.sh ./hack/test-cmd.sh ./hack/test-integration.sh diff --git a/hack/jenkins/verify-dockerized.sh b/hack/jenkins/verify-dockerized.sh new file mode 100755 index 00000000000..e7d45ce30a8 --- /dev/null +++ b/hack/jenkins/verify-dockerized.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail +set -o xtrace + +retry() { + for i in {1..5}; do + "$@" && return 0 || sleep $i + done + "$@" +} + +# This script is intended to be run from kubekins-test container with a +# kubernetes repo mapped in. See hack/jenkins/gotest-dockerized.sh + +export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} + +retry go get github.com/tools/godep && godep version + +export LOG_LEVEL=4 + +cd /go/src/k8s.io/kubernetes + +./hack/install-etcd.sh +./hack/verify-all.sh -v diff --git a/hack/verify-govet.sh b/hack/verify-govet.sh index 32bf2d2779e..8c0d355a0e3 100755 --- a/hack/verify-govet.sh +++ b/hack/verify-govet.sh @@ -24,6 +24,10 @@ source "${KUBE_ROOT}/hack/lib/init.sh" cd "${KUBE_ROOT}" +# This is required before we run govet for the results to be correct. +# See https://github.com/golang/go/issues/16086 for details. +go install ./cmd/... + # Use eval to preserve embedded quoted strings. eval "goflags=(${KUBE_GOFLAGS:-})"