jobs: make pipeutils, pipecfg, and libcloud script globals

jlebon · jlebon · commit e1fdff84e42c · 2023-02-22T16:52:38.000-05:00
In Groovy, variables declared at the topmost scope of the script with
`def` are accessible to the rest of the script and inner scopes. But any
function declared in the script is considered a separate scope and will
not have access to these variables.

I'd like to introduce functions and have those functions have access to
`pipeutils` and `pipecfg`. Since these are generic "immutable" (though
not enforced) variables, let's drop the `def` for them so that they're
"script global".
diff --git a/jobs/build-arch.Jenkinsfile b/jobs/build-arch.Jenkinsfile
@@ -1,8 +1,8 @@
 import org.yaml.snakeyaml.Yaml;
 
-def pipeutils, pipecfg, libcloud
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
     libcloud = load("libcloud.groovy")
diff --git a/jobs/build-cosa.Jenkinsfile b/jobs/build-cosa.Jenkinsfile
@@ -1,8 +1,8 @@
-def pipeutils
 def gitref, commit, shortcommit
 def containername = 'coreos-assembler'
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
 }
 
diff --git a/jobs/build-development.Jenkinsfile b/jobs/build-development.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipecfg, pipeutils
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/build-fcos-buildroot.Jenkinsfile b/jobs/build-fcos-buildroot.Jenkinsfile
@@ -1,8 +1,8 @@
-def pipeutils
 def gitref, commit, shortcommit
 def containername = 'fcos-buildroot'
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/build-mechanical.Jenkinsfile b/jobs/build-mechanical.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipecfg, pipeutils
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile
@@ -1,8 +1,8 @@
 import org.yaml.snakeyaml.Yaml;
 
-def pipeutils, pipecfg, libcloud
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
     libcloud = load("libcloud.groovy")
diff --git a/jobs/bump-lockfile.Jenkinsfile b/jobs/bump-lockfile.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/cloud-replicate.Jenkinsfile b/jobs/cloud-replicate.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg, libcloud
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
     libcloud = load("libcloud.groovy")
diff --git a/jobs/kola-aws.Jenkinsfile b/jobs/kola-aws.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/kola-azure.Jenkinsfile b/jobs/kola-azure.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/kola-gcp.Jenkinsfile b/jobs/kola-gcp.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/kola-kubernetes.Jenkinsfile b/jobs/kola-kubernetes.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/kola-openstack.Jenkinsfile b/jobs/kola-openstack.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }
diff --git a/jobs/release.Jenkinsfile b/jobs/release.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipeutils, pipecfg, libcloud
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
     libcloud = load("libcloud.groovy")
diff --git a/jobs/sync-stream-metadata.Jenkinsfile b/jobs/sync-stream-metadata.Jenkinsfile
@@ -1,6 +1,6 @@
-def pipecfg, pipeutils
 node {
     checkout scm
+    // these are script global vars
     pipeutils = load("utils.groovy")
     pipecfg = pipeutils.load_pipecfg()
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-def pipeutils`
`2`	`1`	`def gitref, commit, shortcommit`
`3`	`2`	`def containername = 'coreos-assembler'`
`4`	`3`	`node {`
`5`	`4`	`checkout scm`
	`5`	`+ // these are script global vars`
`6`	`6`	`pipeutils = load("utils.groovy")`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-def pipecfg, pipeutils`
`2`	`1`	`node {`
`3`	`2`	`checkout scm`
	`3`	`+ // these are script global vars`
`4`	`4`	`pipeutils = load("utils.groovy")`
`5`	`5`	`pipecfg = pipeutils.load_pipecfg()`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-def pipeutils, pipecfg`
`2`	`1`	`node {`
`3`	`2`	`checkout scm`
	`3`	`+ // these are script global vars`
`4`	`4`	`pipeutils = load("utils.groovy")`
`5`	`5`	`pipecfg = pipeutils.load_pipecfg()`
`6`	`6`	`}`