trt-2257: restore default parallelism

Author: neisw

pkg/test/ginkgo/cmd_runsuite.go

@@ -352,33 +352,19 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
 		}
 	}
 
-	// start with suite value
-	parallelism := suite.Parallelism
-	logrus.Infof("Suite defined parallelism %d", parallelism)
-
-	// adjust based on the number of workers
-	totalNodes, workerNodes, err := getClusterNodeCounts(ctx, restConfig)
-	if err != nil {
-		logrus.Errorf("Failed to get cluster node counts: %v", err)
-	} else {
-		// default to 10 concurrent tests per worker but use the min of that
-		// and the current parallelism value
-		if workerNodes > 0 {
-			workerParallelism := 10 * workerNodes
-			logrus.Infof("Parallelism based on worker node count: %d", workerParallelism)
-			parallelism = min(parallelism, workerParallelism)
-		}
+	parallelism := o.Parallelism
+	if parallelism == 0 {
+		parallelism = suite.Parallelism
 	}
 
-	// if 0 set our min value
 	if parallelism == 0 {
 		parallelism = 10
 	}
 
-	// if explicitly set then use the specified value
-	if o.Parallelism > 0 {
-		parallelism = o.Parallelism
-		logrus.Infof("Using specified parallelism value: %d", parallelism)
+	// adjust based on the number of workers
+	totalNodes, workerNodes, err := getClusterNodeCounts(ctx, restConfig)
+	if err != nil {
+		logrus.Errorf("Failed to get cluster node counts: %v", err)
 	}
 
 	logrus.Infof("Total nodes: %d, Worker nodes: %d, Parallelism: %d", totalNodes, workerNodes, parallelism)