diff --git a/Jenkinsfile b/Jenkinsfile index baba215004a..10b1155bd8a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,7 +76,7 @@ pipeline { def slackNotif() { script { try { - if ( env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x' ) { + if ( env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x' || env.BRANCH_NAME == 'jetty-12.1.x' ) { //BUILD_USER = currentBuild.rawBuild.getCause(Cause.UserIdCause).getUserId() // by ${BUILD_USER} COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger'] @@ -126,7 +126,7 @@ def mavenBuild(jdk, cmdline, mvnName) { } } runLaunchable ("verify") - runLaunchable ("record build --name jetty-12.0.x") + runLaunchable ("record build --name jetty-12.1.x") sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -U $cmdline" if(saveHome()) { archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false @@ -138,7 +138,7 @@ def mavenBuild(jdk, cmdline, mvnName) { { junit testDataPublishers: [[$class: 'JUnitFlakyTestDataPublisher']], testResults: '**/target/surefire-reports/**/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true echo "Launchable record tests" - runLaunchable ("record tests --build jetty-12.0.x maven '**/target/surefire-reports/**/*.xml' '**/target/invoker-reports/TEST*.xml'") + runLaunchable ("record tests --build jetty-12.1.x maven '**/target/surefire-reports/**/*.xml' '**/target/invoker-reports/TEST*.xml'") } } } @@ -151,7 +151,7 @@ def useBuildCache() { if (env.BRANCH_NAME ==~ /PR-\d+/) { labelNoBuildCache = pullRequest.labels.contains("build-no-cache") } - def noBuildCache = (env.BRANCH_NAME == 'jetty-12.0.x') || labelNoBuildCache; + def noBuildCache = (env.BRANCH_NAME == 'jetty-12.1.x') || labelNoBuildCache; return !noBuildCache; // want to skip build cache // return false @@ -167,7 +167,7 @@ def saveHome() { def websiteBuild() { script { try { - if (env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x') { + if (env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x' || env.BRANCH_NAME == 'jetty-12.1.x') { build(job: 'website/jetty.website/main', propagate: false, wait: false) } } catch (Exception e) {