From 337772a91f90dd96533d5b8158f014983aa97302 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Tue, 14 Jul 2015 15:57:41 -0700
Subject: [PATCH] fix all tests

---
 build/common.sh                     | 3 ++-
 examples/examples_test.go           | 1 -
 hack/test-update-storage-objects.sh | 2 +-
 test/e2e/kubectl.go                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 build/common.sh

diff --git a/build/common.sh b/build/common.sh
old mode 100644
new mode 100755
index 3cb907817d4e2..3b7e1ff717e0a
--- a/build/common.sh
+++ b/build/common.sh
@@ -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}/"
diff --git a/examples/examples_test.go b/examples/examples_test.go
index 9b1c5bcb01302..0e17933c16018 100644
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -205,7 +205,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"replication": &api.ReplicationController{},
 		},
 		"../examples": {
-			"pod": &api.Pod{},
 			"scheduler-policy-config": &schedulerapi.Policy{},
 		},
 		"../examples/rbd/secret": {
diff --git a/hack/test-update-storage-objects.sh b/hack/test-update-storage-objects.sh
index 88304a0e26e6b..ac9c49a071512 100755
--- a/hack/test-update-storage-objects.sh
+++ b/hack/test-update-storage-objects.sh
@@ -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
 
diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go
index ecb7ca4e959e9..d85a6805f8e2e 100644
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -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)