From 1266ee7adf757e020e4e030d98976df5dfeda5c3 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Tue, 6 Dec 2016 20:31:56 +0100 Subject: [PATCH] Skip not registered nodes in labeling in CA e2e tests --- test/e2e/cluster_size_autoscaling.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/e2e/cluster_size_autoscaling.go b/test/e2e/cluster_size_autoscaling.go index e96a611df82..a6d0517aa83 100644 --- a/test/e2e/cluster_size_autoscaling.go +++ b/test/e2e/cluster_size_autoscaling.go @@ -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 // rare behavior, but only the broken ones. } - - defer removeLabels(newNodesSet) - By(fmt.Sprintf("Setting labels for new nodes: %v", newNodesSet.List())) - updateNodeLabels(c, newNodesSet, labels, nil) - - framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet, - func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout)) + By(fmt.Sprintf("New nodes: %v\n", newNodesSet)) + registeredNodes := sets.NewString() + for nodeName := range newNodesSet { + node, err := f.ClientSet.Core().Nodes().Get(nodeName) + if err == nil && node != nil { + registeredNodes.Insert(nodeName) + } 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(framework.DeleteRCAndPods(f.ClientSet, f.InternalClientset, f.Namespace.Name, "node-selector"))