ceph-{trigger-build,source-dist}: Fix JENKINS-37984

https://issues.jenkins.io/projects/JENKINS/issues/JENKINS-37984

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ceph-source-dist/build/Jenkinsfile b/ceph-source-dist/build/Jenkinsfile
index 7b9e8b3820725c8d3446d1de98ec169b9ac4532f..2ec29bbbcc046cfc4069dbbcb3e4c436238deed2 100644 (file)
--- a/ceph-source-dist/build/Jenkinsfile
+++ b/ceph-source-dist/build/Jenkinsfile
@@ -1,4 +1,6 @@
-def checkout_ref = ""
+import groovy.transform.Field
+
+@Field def checkout_ref = ""
 
 pipeline {
   agent {

diff --git a/ceph-trigger-build/build/Jenkinsfile b/ceph-trigger-build/build/Jenkinsfile
index 7d470081a628d20b28ff4a4c3ef2b2b1847ba1b9..eb7286bd6457113d96526dad55185b461c7a51c1 100644 (file)
--- a/ceph-trigger-build/build/Jenkinsfile
+++ b/ceph-trigger-build/build/Jenkinsfile
@@ -1,11 +1,12 @@
 import groovy.json.JsonBuilder
+import groovy.transform.Field
 
 def pretty(obj) {
   return new JsonBuilder(obj).toPrettyString()
 }
 
 // These parameters are able to be parsed from git trailers
-def gitTrailerParameterNames = [
+@Field def gitTrailerParameterNames = [
   "ARCHS",
   "CEPH_BUILD_BRANCH",
   "CEPH_BUILD_JOB",
@@ -17,7 +18,7 @@ def gitTrailerParameterNames = [
   "SCCACHE",
 ]
 // These are the default parameter values for the pipeline
-def defaults = [
+@Field def defaults = [
   'CEPH_BUILD_JOB': 'ceph-dev-pipeline',
   'DISTROS': 'centos9 jammy noble windows',
   'ARCHS': 'x86_64',
@@ -25,15 +26,15 @@ def defaults = [
 ]
 // This will later hold the initial set of parameters, before any branch-based
 // values are inserted.
-def initialParams = [:]
+@Field def initialParams = [:]
 // this will later hold parameters parsed from git trailers
-def trailerParams = [:]
+@Field def trailerParams = [:]
 // This will later hold one or more parameter sets. Each parameter set will
 // result in a triggered job.
-def paramMaps = []
+@Field def paramMaps = []
 // This will later hold the build's description; we need to store it so that
 // we can append to it later, as there is no way to read it.
-def description = "";
+@Field def description = "";
 
 // This encodes the same logic as the ceph-dev-new-trigger job.
 // It returns a list of one or more parameter sets.