From 3945c73fc28cc02ee8c78e273c19ea4f4411a421 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 13:38:34 -0500 Subject: [PATCH 1/8] Set forkCount to speed up builds? --- pct.sh | 2 +- prep.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pct.sh b/pct.sh index 800a9d7be..f2864cc28 100755 --- a/pct.sh +++ b/pct.sh @@ -14,7 +14,7 @@ else fi # TODO use -ntp if there is a PCT option to pass Maven options -MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war +MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" diff --git a/prep.sh b/prep.sh index 5885aea19..cd94ef327 100755 --- a/prep.sh +++ b/prep.sh @@ -41,9 +41,8 @@ do done # TODO find a way to encode this in some POM so that it can be managed by Dependabot -SNAPSHOT_VERSION=0.5.1-SNAPSHOT # TODO incrementals broken till https://github.com/jenkinsci/plugin-compat-tester/pull/260 is merged -version=0.5.1-20201017.070523-3 # TODO https://github.com/jenkinsci/plugin-compat-tester/pull/261 -pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${SNAPSHOT_VERSION}/plugins-compat-tester-cli-${version}.jar +version=0.5.1-rc1068.959674bdeffd # TODO https://github.com/jenkinsci/plugin-compat-tester/pull/275 +pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}/plugins-compat-tester-cli-${version}.jar [ -f $pct ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/,https://repo.jenkins-ci.org/incrementals/ -Dtransitive=false cp $pct target/pct.jar From 79e172d43858a431c967a0d0ac642a068e8b1ff8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 14:35:01 -0500 Subject: [PATCH 2/8] Weird error in ASTParserUtilsTest.prettyPrintTransformed, hoping reuseForks=false will help --- pct.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pct.sh b/pct.sh index f2864cc28..4dd2cfec4 100755 --- a/pct.sh +++ b/pct.sh @@ -14,7 +14,7 @@ else fi # TODO use -ntp if there is a PCT option to pass Maven options -MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C +MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C:reuseForks=false if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" From 9158dff15732cdcc792ad71c8f4046c440f3ab6d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 14:35:31 -0500 Subject: [PATCH 3/8] org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn is set by https://github.com/jenkinsci/plugin-compat-tester/pull/216 --- pct.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pct.sh b/pct.sh index 4dd2cfec4..24ecaeaa1 100755 --- a/pct.sh +++ b/pct.sh @@ -13,8 +13,7 @@ else PCT_S_ARG= fi -# TODO use -ntp if there is a PCT option to pass Maven options -MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C:reuseForks=false +MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C:reuseForks=false if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" From 0adbc48d2a244a2dd39a40e6c6792d8fabceae38 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 16:09:48 -0500 Subject: [PATCH 4/8] Revert "Bump pipeline-model-definition-plugin.version in /bom-latest" This reverts #428 --- bom-latest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom-latest/pom.xml b/bom-latest/pom.xml index 6ff199e4e..cfcf5ad80 100644 --- a/bom-latest/pom.xml +++ b/bom-latest/pom.xml @@ -12,7 +12,7 @@ 1.5.0 1.47 4.6.0 - 1.8.4 + 1.8.3 2.6.4 1.22 2.41 From dfd2c2dc112bfdddb51305e6860ca7d9f7c04089 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 16:12:37 -0500 Subject: [PATCH 5/8] reuseForks=false did not in fact work around the failure, so not going to bother adding that for now --- pct.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pct.sh b/pct.sh index 24ecaeaa1..9649417ed 100755 --- a/pct.sh +++ b/pct.sh @@ -13,7 +13,7 @@ else PCT_S_ARG= fi -MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C:reuseForks=false +MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" From f37cd79b082935c14008ef2aeac4d6ff299c9c5b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 10 Mar 2021 17:08:35 -0500 Subject: [PATCH 6/8] forkCount=.5C makes things run a bit faster; what about 1C? --- pct.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pct.sh b/pct.sh index 9649417ed..4932461e3 100755 --- a/pct.sh +++ b/pct.sh @@ -13,7 +13,7 @@ else PCT_S_ARG= fi -MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.5C +MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=1C if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" From e6eef68360e227153b5eb9999979ac372487a1c8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 11 Mar 2021 07:15:36 -0500 Subject: [PATCH 7/8] 1C seems too much, let us try .75C --- pct.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pct.sh b/pct.sh index 4932461e3..a09763336 100755 --- a/pct.sh +++ b/pct.sh @@ -13,7 +13,7 @@ else PCT_S_ARG= fi -MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=1C +MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.75C if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" From 85662559ff8d6bdaec41d46dd1c4eef3c1b75441 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 11 Mar 2021 08:07:12 -0500 Subject: [PATCH 8/8] Going back to 1.8.4 but excluding failure pending https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/417 --- bom-latest/pom.xml | 2 +- pct.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bom-latest/pom.xml b/bom-latest/pom.xml index cfcf5ad80..6ff199e4e 100644 --- a/bom-latest/pom.xml +++ b/bom-latest/pom.xml @@ -12,7 +12,7 @@ 1.5.0 1.47 4.6.0 - 1.8.3 + 1.8.4 2.6.4 1.22 2.41 diff --git a/pct.sh b/pct.sh index a09763336..3c7cea937 100755 --- a/pct.sh +++ b/pct.sh @@ -113,4 +113,7 @@ rm -fv pct-work/workflow-basic-steps/target/surefire-reports/TEST-org.jenkinsci. # TODO until dropping 2.235.x so can rely on https://github.com/jenkinsci/workflow-basic-steps-plugin/pull/120 rm -fv pct-work/workflow-basic-steps/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.steps.TimeoutStepTest.xml +# TODO https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/417 +rm -fv pct-work/pipeline-model-definition/pipeline-model-definition/target/surefire-reports/TEST-org.jenkinsci.plugins.pipeline.modeldefinition.parser.ASTParserUtilsTest.xml + # produces: **/target/surefire-reports/TEST-*.xml