Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ stage('prep') {
}
}
}
lines.each {
stash name: it, includes: "pct.sh,excludes.txt,target/pct.jar,target/megawar-$it.war"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

99% of the stash is the megawar (now that PCT has been slimmed down considerably), so it did not seem worth the bother to separate the generic from line-specific contents. Anyway on S3 there is some fixed overhead per blob operation, and each Pipeline step adds a bit of overhead as well, so minimizing the count is probably the better choice. Also this is more legible I think.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense 👍

}
infra.prepareToPublishIncrementals()
}
}
Expand All @@ -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')]) {
Expand Down
2 changes: 1 addition & 1 deletion pct.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down