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
a67fec64
Commit
a67fec64
authored
Sep 12, 2016
by
Random-Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add separate build process for node test.
parent
e5a84398
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
common.sh
build/common.sh
+5
-0
golang.sh
hack/lib/golang.sh
+10
-1
cross.sh
hack/make-rules/cross.sh
+2
-0
No files found.
build/common.sh
View file @
a67fec64
...
...
@@ -949,6 +949,11 @@ function kube::release::package_test_tarball() {
cp
"
${
test_bins
[@]/#/
${
LOCAL_OUTPUT_BINPATH
}
/
${
platform
}
/
}
"
\
"
${
release_stage
}
/platforms/
${
platform
}
"
done
for
platform
in
"
${
KUBE_NODE_TEST_PLATFORMS
[@]
}
"
;
do
mkdir
-p
"
${
release_stage
}
/platforms/
${
platform
}
"
cp
"
${
KUBE_NODE_TEST_BINARIES
[@]/#/
${
LOCAL_OUTPUT_BINPATH
}
/
${
platform
}
/
}
"
\
"
${
release_stage
}
/platforms/
${
platform
}
"
done
# Add the test image files
mkdir
-p
"
${
release_stage
}
/test/images"
...
...
hack/lib/golang.sh
View file @
a67fec64
...
...
@@ -125,7 +125,6 @@ kube::golang::test_targets() {
federation/cmd/genfeddocs
vendor/github.com/onsi/ginkgo/ginkgo
test
/e2e/e2e.test
test
/e2e_node/e2e_node.test
)
if
[
-n
"
${
KUBERNETES_CONTRIB
:-}
"
]
;
then
for
contrib
in
"
${
KUBERNETES_CONTRIB
}
"
;
do
...
...
@@ -148,6 +147,15 @@ readonly KUBE_TEST_PORTABLE=(
hack/lib
)
# Node test has built-in etcd and kube-apiserver, it can only be built on the
# same platforms with kube-apiserver.
readonly
KUBE_NODE_TEST_TARGETS
=(
vendor/github.com/onsi/ginkgo/ginkgo
test
/e2e_node/e2e_node.test
)
readonly
KUBE_NODE_TEST_BINARIES
=(
"
${
KUBE_NODE_TEST_TARGETS
[@]##*/
}
"
)
readonly
KUBE_NODE_TEST_PLATFORMS
=(
"
${
KUBE_SERVER_PLATFORMS
[@]
}
"
)
# Gigabytes desired for parallel platform builds. 11 is fairly
# arbitrary, but is a reasonable splitting point for 2015
# laptops-versus-not.
...
...
@@ -163,6 +171,7 @@ readonly KUBE_ALL_TARGETS=(
"
${
KUBE_SERVER_TARGETS
[@]
}
"
"
${
KUBE_CLIENT_TARGETS
[@]
}
"
"
${
KUBE_TEST_TARGETS
[@]
}
"
"
${
KUBE_NODE_TEST_TARGETS
[@]
}
"
)
readonly
KUBE_ALL_BINARIES
=(
"
${
KUBE_ALL_TARGETS
[@]##*/
}
"
)
...
...
hack/make-rules/cross.sh
View file @
a67fec64
...
...
@@ -32,3 +32,5 @@ make all WHAT="${KUBE_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_SERVER_PL
make all
WHAT
=
"
${
KUBE_CLIENT_TARGETS
[*]
}
"
KUBE_BUILD_PLATFORMS
=
"
${
KUBE_CLIENT_PLATFORMS
[*]
}
"
make all
WHAT
=
"
${
KUBE_TEST_TARGETS
[*]
}
"
KUBE_BUILD_PLATFORMS
=
"
${
KUBE_TEST_PLATFORMS
[*]
}
"
make all
WHAT
=
"
${
KUBE_NODE_TEST_TARGETS
[*]
}
"
KUBE_BUILD_PLATFORMS
=
"
${
KUBE_NODE_TEST_PLATFORMS
[*]
}
"
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