Skip not registered nodes in labeling in CA e2e tests

This commit is contained in:
Marcin Wielgus 2016-12-06 20:31:56 +01:00
parent 653fd97ba0
commit 1266ee7adf

View File

@ -237,13 +237,19 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() {
// However at this moment we DO WANT it to crash so that we don't check all test runs for the // However at this moment we DO WANT it to crash so that we don't check all test runs for the
// rare behavior, but only the broken ones. // rare behavior, but only the broken ones.
} }
By(fmt.Sprintf("New nodes: %v\n", newNodesSet))
defer removeLabels(newNodesSet) registeredNodes := sets.NewString()
By(fmt.Sprintf("Setting labels for new nodes: %v", newNodesSet.List())) for nodeName := range newNodesSet {
updateNodeLabels(c, newNodesSet, labels, nil) node, err := f.ClientSet.Core().Nodes().Get(nodeName)
if err == nil && node != nil {
framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet, registeredNodes.Insert(nodeName)
func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout)) } else {
glog.Errorf("Failed to get node %v: %v", nodeName, err)
}
}
By(fmt.Sprintf("Setting labels for registered new nodes: %v", registeredNodes.List()))
updateNodeLabels(c, registeredNodes, labels, nil)
defer removeLabels(registeredNodes)
framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c)) framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c))
framework.ExpectNoError(framework.DeleteRCAndPods(f.ClientSet, f.InternalClientset, f.Namespace.Name, "node-selector")) framework.ExpectNoError(framework.DeleteRCAndPods(f.ClientSet, f.InternalClientset, f.Namespace.Name, "node-selector"))