From: David Galloway Date: Mon, 3 Nov 2025 14:38:06 +0000 (-0500) Subject: ceph-{trigger-build,source-dist}: Fix JENKINS-37984 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d63d6ee3f7e50ef112d9fee7fd7cf039f0d8eb0c;p=ceph-build.git ceph-{trigger-build,source-dist}: Fix JENKINS-37984 https://issues.jenkins.io/projects/JENKINS/issues/JENKINS-37984 Signed-off-by: David Galloway --- diff --git a/ceph-source-dist/build/Jenkinsfile b/ceph-source-dist/build/Jenkinsfile index 7b9e8b382..2ec29bbbc 100644 --- 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 7d470081a..eb7286bd6 100644 --- 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.