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
337772a9
Commit
337772a9
authored
Jul 14, 2015
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix all tests
parent
b98df5d1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
common.sh
build/common.sh
+2
-1
examples_test.go
examples/examples_test.go
+0
-1
test-update-storage-objects.sh
hack/test-update-storage-objects.sh
+1
-1
kubectl.go
test/e2e/kubectl.go
+3
-3
No files found.
build/common.sh
100644 → 100755
View file @
337772a9
...
...
@@ -332,7 +332,7 @@ function kube::build::source_targets() {
api
build
cmd
docs
/getting-started-guides
docs
examples
Godeps/_workspace/src
Godeps/Godeps.json
...
...
@@ -770,6 +770,7 @@ function kube::release::package_full_tarball() {
cp
-R
"
${
KUBE_ROOT
}
/third_party/htpasswd"
"
${
release_stage
}
/third_party/htpasswd"
cp
-R
"
${
KUBE_ROOT
}
/examples"
"
${
release_stage
}
/"
cp
-R
"
${
KUBE_ROOT
}
/docs"
"
${
release_stage
}
/"
cp
"
${
KUBE_ROOT
}
/README.md"
"
${
release_stage
}
/"
cp
"
${
KUBE_ROOT
}
/LICENSE"
"
${
release_stage
}
/"
cp
"
${
KUBE_ROOT
}
/Vagrantfile"
"
${
release_stage
}
/"
...
...
examples/examples_test.go
View file @
337772a9
...
...
@@ -205,7 +205,6 @@ func TestExampleObjectSchemas(t *testing.T) {
"replication"
:
&
api
.
ReplicationController
{},
},
"../examples"
:
{
"pod"
:
&
api
.
Pod
{},
"scheduler-policy-config"
:
&
schedulerapi
.
Policy
{},
},
"../examples/rbd/secret"
:
{
...
...
hack/test-update-storage-objects.sh
View file @
337772a9
...
...
@@ -93,7 +93,7 @@ startApiServer
# Create a pod
kube::log::status
"Creating a pod"
${
KUBECTL
}
create
-f
examples
/pod.yaml
${
KUBECTL
}
create
-f
docs/user-guide
/pod.yaml
killApiServer
...
...
test/e2e/kubectl.go
View file @
337772a9
...
...
@@ -79,7 +79,7 @@ var _ = Describe("Kubectl client", func() {
Describe
(
"Update Demo"
,
func
()
{
var
updateDemoRoot
,
nautilusPath
,
kittenPath
string
BeforeEach
(
func
()
{
updateDemoRoot
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
examples
/update-demo"
)
updateDemoRoot
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
docs/user-guide
/update-demo"
)
nautilusPath
=
filepath
.
Join
(
updateDemoRoot
,
"nautilus-rc.yaml"
)
kittenPath
=
filepath
.
Join
(
updateDemoRoot
,
"kitten-rc.yaml"
)
})
...
...
@@ -142,7 +142,7 @@ var _ = Describe("Kubectl client", func() {
var
podPath
string
BeforeEach
(
func
()
{
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
examples
/pod.yaml"
)
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
docs/user-guide
/pod.yaml"
)
By
(
"creating the pod"
)
runKubectl
(
"create"
,
"-f"
,
podPath
,
fmt
.
Sprintf
(
"--namespace=%v"
,
ns
))
checkPodsRunningReady
(
c
,
ns
,
[]
string
{
simplePodName
},
podStartTimeout
)
...
...
@@ -206,7 +206,7 @@ var _ = Describe("Kubectl client", func() {
var
podPath
string
var
nsFlag
string
BeforeEach
(
func
()
{
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
examples
/pod.yaml"
)
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
docs/user-guide
/pod.yaml"
)
By
(
"creating the pod"
)
nsFlag
=
fmt
.
Sprintf
(
"--namespace=%v"
,
ns
)
runKubectl
(
"create"
,
"-f"
,
podPath
,
nsFlag
)
...
...
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