github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25564 from davidopp/fix-pod-affinity-test

Browse Source 
Move test input files from test/e2e/node-selection/ to test/e2e/testing-manifests/
This commit is contained in:
Jeff Lowdermilk 2016-05-13 16:07:20 -07:00
commit e02cad4a11
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/scheduler_predicates.go
View File

@ -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.") By("Trying to launch a pod that with NodeAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-labels" 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") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-node-affinity.yaml")
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) 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.") By("Trying to launch a pod that with PodAffinity & PodAntiAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-newlabels" 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") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-pod-affinity.yaml")
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0))

0
test/e2e/node-selection/pod-with-node-affinity.yaml → test/e2e/testing-manifests/node-selection/pod-with-node-affinity.yaml
View File

0
test/e2e/node-selection/pod-with-pod-affinity.yaml → test/e2e/testing-manifests/node-selection/pod-with-pod-affinity.yaml
View File