github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29185 from soltysh/make_verify

Browse Source 
Automatic merge from submit-queue

Fix make verify

@thockin this fixes `make verify` which was previously failing due to undefined `BRANCH` and `VERBOSE` variables, ptal
This commit is contained in:
k8s-merge-robot 2016-08-02 01:53:44 -07:00 committed by GitHub
commit ca7ad6896b
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -50,6 +50,7 @@ KUBE_GOFLAGS := $(GOFLAGS)
KUBE_GOLDFLAGS := $(GOLDFLAGS) KUBE_GOLDFLAGS := $(GOLDFLAGS)
GOGCFLAGS ?= GOGCFLAGS ?=
BRANCH ?=
KUBE_GOGCFLAGS = $(GOGCFLAGS) KUBE_GOGCFLAGS = $(GOGCFLAGS)
export KUBE_GOGCFLAGS GOGCFLAGS export KUBE_GOGCFLAGS GOGCFLAGS
@ -94,6 +95,7 @@ ginkgo:
.PHONY: verify .PHONY: verify
verify: verify:
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh -v KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh -v
hack/make-rules/vet.sh
# Build and run tests. # Build and run tests.
# #

2
hack/jenkins/verify-dockerized.sh
View File

@ -38,4 +38,4 @@ export LOG_LEVEL=4
cd /go/src/k8s.io/kubernetes cd /go/src/k8s.io/kubernetes
./hack/install-etcd.sh ./hack/install-etcd.sh
make verify VERBOSE=1 make verify

2
hack/jenkins/verify.sh
View File

@ -34,4 +34,4 @@ export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
command -v etcd &>/dev/null || ./hack/install-etcd.sh command -v etcd &>/dev/null || ./hack/install-etcd.sh
go get -u github.com/tools/godep go get -u github.com/tools/godep
make verify VERBOSE=1 make verify

7
hack/make-rules/verify.sh
View File

@ -21,15 +21,10 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/lib/util.sh" source "${KUBE_ROOT}/cluster/lib/util.sh"
if [ -n "${VERBOSE}" ]; then
SILENT=false
else
SILENT=true
fi
# Excluded checks are always skipped. # Excluded checks are always skipped.
EXCLUDED_CHECKS=( EXCLUDED_CHECKS=(
"verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage "verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage
"verify-govet.sh" # it has a separate make vet target
) )
function is-excluded { function is-excluded {