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
baaf1b62
Commit
baaf1b62
authored
May 27, 2016
by
Alex Robinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #25696 from rmmh/showbuildlog
Show hack/build-go.sh output during e2e tests.
parents
91f8c784
0974b959
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
e2e_build.go
test/e2e_node/e2e_build.go
+5
-2
e2e_remote.go
test/e2e_node/e2e_remote.go
+6
-3
No files found.
test/e2e_node/e2e_build.go
View file @
baaf1b62
...
@@ -36,9 +36,12 @@ func buildGo() {
...
@@ -36,9 +36,12 @@ func buildGo() {
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Fatalf
(
"Failed to locate kubernetes root directory %v."
,
err
)
glog
.
Fatalf
(
"Failed to locate kubernetes root directory %v."
,
err
)
}
}
out
,
err
:=
exec
.
Command
(
filepath
.
Join
(
k8sRoot
,
"hack/build-go.sh"
))
.
CombinedOutput
()
cmd
:=
exec
.
Command
(
filepath
.
Join
(
k8sRoot
,
"hack/build-go.sh"
))
cmd
.
Stdout
=
os
.
Stdout
cmd
.
Stderr
=
os
.
Stderr
err
=
cmd
.
Run
()
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Fatalf
(
"Failed to build go packages %v
. Output:
\n
%s"
,
err
,
out
)
glog
.
Fatalf
(
"Failed to build go packages %v
\n
"
,
err
)
}
}
}
}
...
...
test/e2e_node/e2e_remote.go
View file @
baaf1b62
...
@@ -62,9 +62,12 @@ func CreateTestArchive() string {
...
@@ -62,9 +62,12 @@ func CreateTestArchive() string {
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Fatalf
(
"Failed to locate test/e2e_node directory %v."
,
err
)
glog
.
Fatalf
(
"Failed to locate test/e2e_node directory %v."
,
err
)
}
}
out
,
err
:=
exec
.
Command
(
"ginkgo"
,
"build"
,
testDir
)
.
CombinedOutput
()
cmd
:=
exec
.
Command
(
"ginkgo"
,
"build"
,
testDir
)
cmd
.
Stdout
=
os
.
Stdout
cmd
.
Stderr
=
os
.
Stderr
err
=
cmd
.
Run
()
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Fatalf
(
"Failed to build e2e tests under %s %v
. Output:
\n
%s"
,
testDir
,
err
,
out
)
glog
.
Fatalf
(
"Failed to build e2e tests under %s %v
\n
"
,
testDir
,
err
)
}
}
ginkgoTest
:=
filepath
.
Join
(
testDir
,
"e2e_node.test"
)
ginkgoTest
:=
filepath
.
Join
(
testDir
,
"e2e_node.test"
)
if
_
,
err
:=
os
.
Stat
(
ginkgoTest
);
err
!=
nil
{
if
_
,
err
:=
os
.
Stat
(
ginkgoTest
);
err
!=
nil
{
...
@@ -94,7 +97,7 @@ func CreateTestArchive() string {
...
@@ -94,7 +97,7 @@ func CreateTestArchive() string {
defer
os
.
RemoveAll
(
tardir
)
defer
os
.
RemoveAll
(
tardir
)
// Copy binaries
// Copy binaries
out
,
err
=
exec
.
Command
(
"cp"
,
ginkgoTest
,
filepath
.
Join
(
tardir
,
"e2e_node.test"
))
.
CombinedOutput
()
out
,
err
:
=
exec
.
Command
(
"cp"
,
ginkgoTest
,
filepath
.
Join
(
tardir
,
"e2e_node.test"
))
.
CombinedOutput
()
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Fatalf
(
"Failed to copy e2e_node.test %v."
,
err
)
glog
.
Fatalf
(
"Failed to copy e2e_node.test %v."
,
err
)
}
}
...
...
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