Fix and modernize pipeline code

- Use more modern Groovy looping constructs now that they work with
  new pipeline plugin versions.
- Fix the Python bootstrap script to work in case the workspace is
  empty when the script starts.

Change-Id: Ief3bebefd90eb44c6f89264dcb122ddd9b2eefcb

Author: teemumurtola

workflow/ondemand.groovy

@@ -55,11 +55,9 @@ def setEnvFromActions(overrides)
 def doBuild()
 {
     def builds = actions.builds
-    def tasks = [:]
     def builders = getBuildersMap()
-    for (int i = 0; i != builds.size(); ++i) {
-        def bld = builds[i]
-        tasks[bld.type] = { builders[bld.type](bld) }
+    def tasks = builds.collectEntries {
+        [(it.type): { builders[it.type](it) }]
     }
     parallel tasks
     setBuildResult(builds)
@@ -240,8 +238,7 @@ def addSummaryForTriggeredBuilds(builds)
         Builds:
         <table>
         """.stripIndent()
-    for (int i = 0; i != builds.size(); ++i) {
-        def bld = builds[i]
+    for (def bld : builds) {
         def summary = bld.status.result
         if (bld.summary) {
             summary = bld.summary

workflow/release.groovy

@@ -140,12 +140,8 @@ def setTarballEnvironmentVariablesForReleng()
 
 def testTarballs(tarballBuilds, testMatrix)
 {
-    def tasks = [:]
-    for (int i = 0; i != testMatrix.configs.size(); ++i) {
-        def config = testMatrix.configs[i]
-        tasks[config.opts] = {
-            runSingleTestConfig(tarballBuilds, config)
-        }
+    def tasks = testMatrix.configs.collectEntries {
+        [(it.opts): { runSingleTestConfig(tarballBuilds, it) }]
     }
     parallel tasks
     addConfigurationSummary(testMatrix.configs)
@@ -199,8 +195,7 @@ def addConfigurationSummary(testConfigs)
             <td>Result</td>
           </tr>
         """.stripIndent()
-    for (int i = 0; i != testConfigs.size(); ++i) {
-        def config = testConfigs[i]
+    for (def config : testConfigs) {
         def opts = config.opts.join(' ')
         text += """\
             <tr>

workflow/utils.groovy

@@ -95,12 +95,12 @@ def runRelengScriptInternal(prepareScript, contents, propagate)
         except:
             pass
         os.environ['STATUS_FILE'] = '${statusFile}'
-        sys.path.append(os.path.abspath('releng'))
         """.stripIndent()
     if (!propagate) {
         script += "os.environ['NO_PROPAGATE_FAILURE'] = '1'\n"
     }
     script += prepareScript.stripIndent()
+    script += "sys.path.append(os.path.abspath('releng'))\n"
     script += "import releng\n"
     script += contents.stripIndent()
     try {
@@ -224,8 +224,7 @@ def addBuildRevisionsSummary(revisionList)
         Built revisions:
         <table>
         """.stripIndent()
-    for (int i = 0; i != revisionList.size(); ++i) {
-        def rev = revisionList[i]
+    for (def rev : revisionList) {
         text += """\
             <tr>
               <td>${rev.project}:</td>
@@ -314,8 +313,8 @@ def readSourceVersion()
 def setCombinedBuildResult(results)
 {
     def combinedResult = hudson.model.Result.SUCCESS
-    for (int i = 0; i != results.size(); ++i) {
-        def result = hudson.model.Result.fromString(results[i])
+    for (def resultStr : results) {
+        def result = hudson.model.Result.fromString(resultStr)
         combinedResult = combinedResult.combine(result)
     }
     currentBuild.setResult(combinedResult.toString())