diff --git a/Jenkinsfile b/Jenkinsfile index 37ea94f6a..e7f392e8d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,6 +58,9 @@ stage('prep') { } } } + lines.each { line -> + stash name: line, includes: "pct.sh,excludes.txt,target/pct.jar,target/megawar-${line}.war" + } infra.prepareToPublishIncrementals() } } @@ -68,14 +71,13 @@ lines.each {line -> branches["pct-$plugins-$line"] = { def jdk = line == 'weekly' ? 17 : 11 mavenEnv(jdk: jdk) { - deleteDir() - checkout scm + unstash line withEnv([ "PLUGINS=$plugins", "LINE=$line", 'EXTRA_MAVEN_PROPERTIES=maven.test.failure.ignore=true:surefire.rerunFailingTestsCount=1' ]) { - sh 'bash prep-megawar.sh && bash prep-pct.sh && bash pct.sh' + sh 'bash pct.sh' } launchable.install() withCredentials([string(credentialsId: 'launchable-jenkins-bom', variable: 'LAUNCHABLE_TOKEN')]) { diff --git a/pct.sh b/pct.sh index 32e2acdc0..6caf0db69 100755 --- a/pct.sh +++ b/pct.sh @@ -2,7 +2,7 @@ set -euxo pipefail cd "$(dirname "$0")" -# expects: target/megawar-$LINE.war, target/pct.jar, $PLUGINS, $LINE +# expects: excludes.txt, target/megawar-$LINE.war, target/pct.jar, $PLUGINS, $LINE rm -rf pct-work