Disable parallelism in Blue Ocean test suite (#2496)

jenkinsci · Sep 12, 2023 · 60c4200 · 60c4200
1 parent 3a88b91
commit 60c4200
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/excludes.txt b/excludes.txt
@@ -1,11 +1,6 @@
 # TODO cryptic PCT-only errors: https://github.com/jenkinsci/bom/pull/251#issuecomment-645012427
 hudson.matrix.AxisTest
 
-# TODO tends to run out of memory
-io.jenkins.blueocean.rest.impl.pipeline.PipelineNodeTest
-io.jenkins.blueocean.rest.impl.pipeline.RestartStageTest
-io.jenkins.blueocean.rest.impl.pipeline.RunImplTest
-
 # TODO https://github.com/jenkinsci/blueocean-plugin/pull/2471
 io.jenkins.blueocean.service.embedded.PipelineApiTest
 

diff --git a/pct.sh b/pct.sh
@@ -12,6 +12,13 @@ if [[ -n ${EXTRA_MAVEN_PROPERTIES-} ]]; then
 		PCT_D_ARGS+="-D${prop} "
 	done
 fi
+if ! [[ $PLUGINS =~ blueocean ]]; then
+	#
+	# The Blue Ocean test suite uses a lot of memory and cannot handle
+	# parallelism.
+	#
+	PCT_D_ARGS+='-DforkCount=.75C '
+fi
 
 exec java \
 	-jar target/pct.jar \
@@ -20,7 +27,6 @@ exec java \
 	--include-plugins "${PLUGINS}" \
 	--working-dir "$(pwd)/target/pct-work" \
 	$PCT_D_ARGS \
-	-DforkCount=.75C \
 	-Djth.jenkins-war.path="$(pwd)/target/megawar-$LINE.war" \
 	-Dsurefire.excludesFile="$(pwd)/excludes.txt"