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
6e516e1c
Commit
6e516e1c
authored
Jun 07, 2016
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make Jenkins pass
parent
23bbf477
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
Makefile
Makefile
+3
-3
e2e-node-jenkins.sh
test/e2e_node/jenkins/e2e-node-jenkins.sh
+1
-0
No files found.
Makefile
View file @
6e516e1c
...
@@ -329,7 +329,7 @@ ALL_GO_DIRS := $(shell \
...
@@ -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)
...
@@ -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
...
@@ -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
\
)
)
...
...
test/e2e_node/jenkins/e2e-node-jenkins.sh
View file @
6e516e1c
...
@@ -28,6 +28,7 @@ set -x
...
@@ -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/"
}
...
...
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