diff --git a/pct.sh b/pct.sh index 800a9d7be..3c7cea937 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 +MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.75C if [ -v EXTRA_MAVEN_PROPERTIES ] then MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES" @@ -114,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 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