From dd70a5e579d54e4e2ab5a15e2965829446db9df7 Mon Sep 17 00:00:00 2001 From: David Oppenheimer Date: Fri, 13 May 2016 00:01:50 -0700 Subject: [PATCH] Move test input files from test/e2e/node-selection/ to test/e2e/testing-manifests/ since the latter are included in the test tarball while the former are not. --- test/e2e/scheduler_predicates.go | 4 ++-- .../node-selection/pod-with-node-affinity.yaml | 0 .../node-selection/pod-with-pod-affinity.yaml | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename test/e2e/{ => testing-manifests}/node-selection/pod-with-node-affinity.yaml (100%) rename test/e2e/{ => testing-manifests}/node-selection/pod-with-pod-affinity.yaml (100%) diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index fba55636b0b..dfb430660f5 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -718,7 +718,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { By("Trying to launch a pod that with NodeAffinity setting as embedded JSON string in the annotation value.") labelPodName := "with-labels" - nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/node-selection") + nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/testing-manifests/node-selection") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-node-affinity.yaml") framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) @@ -1265,7 +1265,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { By("Trying to launch a pod that with PodAffinity & PodAntiAffinity setting as embedded JSON string in the annotation value.") labelPodName := "with-newlabels" - nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/node-selection") + nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/testing-manifests/node-selection") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-pod-affinity.yaml") framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) diff --git a/test/e2e/node-selection/pod-with-node-affinity.yaml b/test/e2e/testing-manifests/node-selection/pod-with-node-affinity.yaml similarity index 100% rename from test/e2e/node-selection/pod-with-node-affinity.yaml rename to test/e2e/testing-manifests/node-selection/pod-with-node-affinity.yaml diff --git a/test/e2e/node-selection/pod-with-pod-affinity.yaml b/test/e2e/testing-manifests/node-selection/pod-with-pod-affinity.yaml similarity index 100% rename from test/e2e/node-selection/pod-with-pod-affinity.yaml rename to test/e2e/testing-manifests/node-selection/pod-with-pod-affinity.yaml