Adding testing-manifests to the test tar ball

This commit is contained in:
Maisem Ali 2016-02-09 14:09:26 -08:00
parent 1168df93f6
commit 4dfdb154fb
9 changed files with 5 additions and 6 deletions

View File

@ -87,8 +87,7 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets))
readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}") readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}")
readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}") readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}")
readonly KUBE_TEST_PORTABLE=( readonly KUBE_TEST_PORTABLE=(
test/images/network-tester/rc.json test/e2e/testing-manifests
test/images/network-tester/service.json
test/kubemark test/kubemark
hack/e2e.go hack/e2e.go
hack/e2e-internal hack/e2e-internal

View File

@ -170,7 +170,7 @@ var _ = Describe("Kubectl client", func() {
var podPath string var podPath string
BeforeEach(func() { BeforeEach(func() {
podPath = filepath.Join(testContext.RepoRoot, "examples/readiness-probe-pod") podPath = filepath.Join(testContext.RepoRoot, "test", "e2e", "testing-manifests", "kubectl", "pod-with-readiness-probe.yaml")
By(fmt.Sprintf("creating the pod from %v", podPath)) By(fmt.Sprintf("creating the pod from %v", podPath))
runKubectlOrDie("create", "-f", podPath, fmt.Sprintf("--namespace=%v", ns)) runKubectlOrDie("create", "-f", podPath, fmt.Sprintf("--namespace=%v", ns))
checkPodsRunningReady(c, ns, []string{simplePodName}, podStartTimeout) checkPodsRunningReady(c, ns, []string{simplePodName}, podStartTimeout)

View File

@ -38,7 +38,7 @@ func getLoadBalancerControllers(repoRoot string, client *client.Client) []LBCTes
return []LBCTester{ return []LBCTester{
&haproxyControllerTester{ &haproxyControllerTester{
name: "haproxy", name: "haproxy",
cfg: filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "haproxyrc.yaml"), cfg: filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "haproxyrc.yaml"),
client: client, client: client,
}, },
} }
@ -49,8 +49,8 @@ func getIngManagers(repoRoot string, client *client.Client) []*ingManager {
return []*ingManager{ return []*ingManager{
{ {
name: "netexec", name: "netexec",
rcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecrc.yaml")}, rcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "netexecrc.yaml")},
svcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecsvc.yaml")}, svcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "netexecsvc.yaml")},
svcNames: []string{}, svcNames: []string{},
client: client, client: client,
}, },