From 73a98f51cd1bc505517f33ee5258824cbde04cec Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 21 Apr 2023 16:06:13 -0400
Subject: [PATCH 1/2] Resume stashing megawars

---
 Jenkinsfile | 8 +++++---
 pct.sh      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 37ea94f6a..23c43a223 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,6 +58,9 @@ stage('prep') {
         }
       }
     }
+    lines.each {
+      stash name: it, includes: "pct.sh,excludes.txt,target/pct.jar,target/megawar-$it.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
 

From 403175ca9a6e754469f8b0d8cd884bb386f2b06a Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 21 Apr 2023 16:22:13 -0400
Subject: [PATCH 2/2] `groovy.lang.MissingPropertyException: No such field
 found: field java.lang.String war`

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 23c43a223..e7f392e8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,8 +58,8 @@ stage('prep') {
         }
       }
     }
-    lines.each {
-      stash name: it, includes: "pct.sh,excludes.txt,target/pct.jar,target/megawar-$it.war"
+    lines.each { line ->
+      stash name: line, includes: "pct.sh,excludes.txt,target/pct.jar,target/megawar-${line}.war"
     }
     infra.prepareToPublishIncrementals()
   }