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
4cd6bf42
Commit
4cd6bf42
authored
Jul 29, 2016
by
jayunit100
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[minor] couple of quick cleanups for kill reporoot
parent
6166083c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
14 deletions
+2
-14
update-bindata.sh
hack/update-bindata.sh
+2
-3
util.go
test/e2e/framework/util.go
+0
-5
e2e-node-jenkins.sh
test/e2e_node/jenkins/e2e-node-jenkins.sh
+0
-6
No files found.
hack/update-bindata.sh
View file @
4cd6bf42
...
@@ -16,14 +16,13 @@
...
@@ -16,14 +16,13 @@
set
-o
errexit
set
-o
errexit
set
-o
pipefail
set
-o
pipefail
set
-o
nounset
if
[[
-z
${
KUBE_ROOT
}
]]
;
then
if
[[
-z
"
${
KUBE_ROOT
:-}
"
]]
;
then
echo
"KUBE_ROOT not detected, setting default."
echo
"KUBE_ROOT not detected, setting default."
KUBE_ROOT
=
"../../../"
KUBE_ROOT
=
"../../../"
fi
fi
set
-o
nounset
if
[[
!
-d
"
${
KUBE_ROOT
}
/examples"
]]
;
then
if
[[
!
-d
"
${
KUBE_ROOT
}
/examples"
]]
;
then
echo
"
${
KUBE_ROOT
}
/examples not detected. This script should be run from a location where the source dirs are available."
echo
"
${
KUBE_ROOT
}
/examples not detected. This script should be run from a location where the source dirs are available."
exit
1
exit
1
...
...
test/e2e/framework/util.go
View file @
4cd6bf42
...
@@ -653,11 +653,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
...
@@ -653,11 +653,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
// Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
// Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
// to flip to Ready, log its output and delete it.
// to flip to Ready, log its output and delete it.
func
RunKubernetesServiceTestContainer
(
c
*
client
.
Client
,
ns
string
)
{
func
RunKubernetesServiceTestContainer
(
c
*
client
.
Client
,
ns
string
)
{
c
,
err
:=
LoadClient
()
if
err
!=
nil
{
Logf
(
"Failed to load client"
)
return
}
path
:=
"test/images/clusterapi-tester/pod.yaml"
path
:=
"test/images/clusterapi-tester/pod.yaml"
p
,
err
:=
podFromManifest
(
path
)
p
,
err
:=
podFromManifest
(
path
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/e2e_node/jenkins/e2e-node-jenkins.sh
View file @
4cd6bf42
...
@@ -28,12 +28,6 @@ set -x
...
@@ -28,12 +28,6 @@ set -x
.
$1
.
$1
if
[
"
$INSTALL_GODEP
"
=
true
]
;
then
go get
-u
github.com/tools/godep
go get
-u
github.com/onsi/ginkgo/ginkgo
go get
-u
github.com/onsi/gomega
fi
make generated_files
make generated_files
# TODO converge build steps with hack/build-go some day if possible.
# TODO converge build steps with hack/build-go some day if possible.
...
...
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