Merge pull request #26697 from gmarek/affinity

Automatic merge from submit-queue

Disable PodAffinity SchedulerPredicates test

This feature is disabled, so it's not surprising that tests don't work.

cc @davidopp @kevin-wangzefeng 

@david-mcmahon - this disables the second test that causes failures in SchedulerPredicates suite. When this and #26695 are merged it should be passing in serial.
This commit is contained in:
k8s-merge-robot 2016-06-02 05:15:58 -07:00
commit 0ba4d88e4c

View File

@ -1222,7 +1222,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
})
// Verify that an escaped JSON string of pod affinity and pod anti affinity in a YAML PodSpec works.
It("validates that embedding the JSON PodAffinity and PodAntiAffinity setting as a string in the annotation value work", func() {
It("validates that embedding the JSON PodAffinity and PodAntiAffinity setting as a string in the annotation value work [Feature:PodAffinity]", func() {
// launch a pod to find a node which can launch a pod. We intentionally do
// not just take the node list and choose the first of them. Depending on the
// cluster and the scheduler it might be that a "normal" pod cannot be