From b356030abb6c7d9d22861291a9b91966fb9e71ce Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 19 Jan 2021 18:33:52 +0100 Subject: [PATCH] Skip PD tests on 1 node cluster The PD tests should skip themselves if they observe only 1 node is schedulable. --- test/e2e/storage/pd.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/pd.go b/test/e2e/storage/pd.go index 4aa726b0007..b3dc2ffd015 100644 --- a/test/e2e/storage/pd.go +++ b/test/e2e/storage/pd.go @@ -29,7 +29,6 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" "github.com/onsi/ginkgo" - "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" policyv1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/resource" @@ -84,7 +83,9 @@ var _ = utils.SIGDescribe("Pod Disks", func() { var err error nodes, err = e2enode.GetReadySchedulableNodes(cs) framework.ExpectNoError(err) - gomega.Expect(len(nodes.Items)).To(gomega.BeNumerically(">=", minNodes), fmt.Sprintf("Requires at least %d nodes", minNodes)) + if len(nodes.Items) < minNodes { + e2eskipper.Skipf("The test requires %d schedulable nodes, got only %d", minNodes, len(nodes.Items)) + } host0Name = types.NodeName(nodes.Items[0].ObjectMeta.Name) host1Name = types.NodeName(nodes.Items[1].ObjectMeta.Name) })