github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

make Jenkins pass

Browse Source
This commit is contained in:
Tim Hockin 2016-06-07 22:04:54 -07:00
parent 23bbf477f8
commit 6e516e1c8a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -329,7 +329,7 @@ ALL_GO_DIRS := $(shell \
\) \ \) \
-type f -name \*.go \ -type f -name \*.go \
| sed 's|^./||' \ | sed 's|^./||' \
| xargs dirname \ | xargs -n1 dirname \
| sort -u \ | sort -u \
) )
@ -413,7 +413,7 @@ ifeq ($(DBG_MAKEFILE),1)
endif endif
DEEPCOPY_DIRS := $(shell \ DEEPCOPY_DIRS := $(shell \
grep -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \ grep -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \
| xargs dirname \ | xargs -n1 dirname \
| sort -u \ | sort -u \
) )
DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS)) DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS))
@ -522,7 +522,7 @@ endif
CONVERSION_DIRS := $(shell \ CONVERSION_DIRS := $(shell \
grep '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \ grep '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
| cut -f1 -d: \ | cut -f1 -d: \
| xargs dirname \ | xargs -n1 dirname \
| sort -u \ | sort -u \
) )

1
test/e2e_node/jenkins/e2e-node-jenkins.sh
View File

@ -28,6 +28,7 @@ set -x
. $1 . $1
make generated_files
go build test/e2e_node/environment/conformance.go go build test/e2e_node/environment/conformance.go
WORKSPACE=${WORKSPACE:-"/tmp/"} WORKSPACE=${WORKSPACE:-"/tmp/"}