This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch fix-jenkins in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3cabf8471473a3bc920d0167fcf306e81a161fd5 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Thu Jul 3 12:18:56 2025 +0200 Try to fix Jenkins --- Jenkinsfile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 87c141ea3c..a659f81471 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ pipeline { options { skipDefaultCheckout() durabilityHint('PERFORMANCE_OPTIMIZED') - //buildDiscarder logRotator( numToKeepStr: '60' ) disableRestartFromStage() } stages { @@ -18,7 +17,7 @@ pipeline { steps { timeout(time: 210, unit: 'MINUTES') { checkout scm - mavenBuild("jdk_17_latest", "-Djacoco.skip=true") + mavenBuild("jdk_17_latest", "") script { properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME == 'master' ? '30' : '5'))]) if (env.BRANCH_NAME == 'master') { @@ -38,13 +37,7 @@ pipeline { steps { timeout(time: 210, unit: 'MINUTES') { checkout scm - // jacoco is definitely too slow - mavenBuild("jdk_21_latest", "") // "-Pjacoco jacoco-aggregator:report-aggregate-all" - // recordIssues id: "analysis-jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, - // tools: [mavenConsole(), java(), checkStyle(), errorProne(), spotBugs(), javaDoc()], - // skipPublishingChecks: true, skipBlames: true - // recordCoverage id: "coverage-jdk21", name: "Coverage jdk21", tools: [[parser: 'JACOCO',pattern: 'target/site/jacoco-aggregate/jacoco.xml']], - // sourceCodeRetention: 'MODIFIED', sourceDirectories: [[path: 'src/main/java']] + mavenBuild("jdk_21_latest", "") } } } @@ -65,16 +58,11 @@ def mavenBuild(jdk, extraArgs) { script { try { withEnv(["JAVA_HOME=${tool "$jdk"}", - "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", + "PATH+MAVEN=${tool "$jdk"}/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { - sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.9" - sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master" - // we use two steps so that we can cache artifacts downloaded from Maven Central repository - // without installing any local artifacts to not pollute the cache - sh "echo package Its" - sh "./mvnw package -DskipTests -e -B -V -Prun-its -Dmaven.repo.local=${env.WORKSPACE}/.repository/cached" + sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.10" sh "echo run Its" - sh "./mvnw install -Pci $extraArgs -Dmaven.home=${env.WORKSPACE}/.apache-maven-master -e -B -V -Prun-its -Dmaven.repo.local=${env.WORKSPACE}/.repository/local -Dmaven.repo.local.tail=${env.WORKSPACE}/.repository/cached" + sh "./mvnw install $extraArgs -e -B -V -Prun-its" } } finally { @@ -82,4 +70,3 @@ def mavenBuild(jdk, extraArgs) { } } } -// vim: et:ts=2:sw=2:ft=groovy