Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
2a2b46a1
Commit
2a2b46a1
authored
Jul 19, 2016
by
Maciej Szulik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix make verify
parent
4fdde68f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
8 deletions
+5
-8
Makefile
Makefile
+2
-0
verify-dockerized.sh
hack/jenkins/verify-dockerized.sh
+1
-1
verify.sh
hack/jenkins/verify.sh
+1
-1
verify.sh
hack/make-rules/verify.sh
+1
-6
No files found.
Makefile
View file @
2a2b46a1
...
@@ -50,6 +50,7 @@ KUBE_GOFLAGS := $(GOFLAGS)
...
@@ -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:
...
@@ -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.
#
#
...
...
hack/jenkins/verify-dockerized.sh
View file @
2a2b46a1
...
@@ -38,4 +38,4 @@ export LOG_LEVEL=4
...
@@ -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
hack/jenkins/verify.sh
View file @
2a2b46a1
...
@@ -34,4 +34,4 @@ export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
...
@@ -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
hack/make-rules/verify.sh
View file @
2a2b46a1
...
@@ -21,15 +21,10 @@ set -o pipefail
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment