Create multiple job suites.

1 files changed, 96 insertions, 93 deletions

diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy
index 6c7d39e..0c9bbeb 100644
--- a/jenkins/generator_DSL.groovy
+++ b/jenkins/generator_DSL.groovy
@@ -6,14 +6,9 @@ import org.yaml.snakeyaml.Yaml
 
 def yaml = new Yaml()
 def config = yaml.load(readFileFromWorkspace("manifests/${manifest_file}"))
-def job_def_generation_time = new Date() 
+def job_def_generation_time = new Date()
 
 
-//-----------------------------------------------------------------------
-// Create a folder to contain the jobs which are created below.
-
-suite_name = "${manifest_file.tokenize(".")[0]}_${label}_py${py_version}"
-folder(suite_name)
 
 
 //-----------------------------------------------------------------------
@@ -30,98 +25,106 @@ this.build_control_branch= this.build_control_branch.trim()
 
 println("**LABELS:")
 for (label in labels.trim().tokenize()) {
-  println("${label}")
-}
-
-
-pipelineJob("${suite_name}/_${script.tokenize(".")[0]}") {
-    // At trigger-time, allow for setting manifest culling behavior.
-    parameters {
-        booleanParam("cull_manifest",
-                     true,
-                     "Whether or not package recipes that would generate a " +
-                     "package file name that already exists in the manfest's" +
-                     " channel archive are removed from the build list.")
-    }
-    println("\n" +
-    "script: ${this.script}\n" +
-    "MANIFEST_FILE: ${manifest_file}\n" +
-    "LABEL: ${label}\n" +
-    "LABELS: ${labels}\n" +
-    "PY_VERSION: ${py_version}\n" +
-    "BUILD_CONTROL_REPO: ${build_control_repo}\n" +
-    "BUILD_CONTROL_BRANCH: ${build_control_branch}\n" +
-    "CONDA_VERSION: ${conda_version}\n" +
-    "CONDA_BUILD_VERSION: ${conda_build_version}\n" +
-    "CONDA_BASE_URL: ${conda_base_URL}\n" +
-    "UTILS_REPO: ${utils_repo}\n")
-    environmentVariables {
-        env("JOB_DEF_GENERATION_TIME", job_def_generation_time)
-        env("SCRIPT", this.script)
-        env("MANIFEST_FILE", manifest_file)
-        env("LABEL", label)
-        env("PY_VERSION", py_version)
-        env("BUILD_CONTROL_REPO", build_control_repo)
-        env("BUILD_CONTROL_BRANCH", build_control_branch)
-        env("CONDA_VERSION", conda_version)
-        env("CONDA_BUILD_VERSION", conda_build_version)
-        env("CONDA_BASE_URL", conda_base_URL)
-        env("UTILS_REPO", utils_repo)
-    }
-    definition {
-        cps {
-            script(readFileFromWorkspace("jenkins/${this.script}"))
-            sandbox()
-        }
-    }
-}
+    for (py_version in py_versions.trim().tokenize()) {
+        println("**** ${label}-${py_version}")
 
+        //-----------------------------------------------------------------------
+        // Create a folder to contain the jobs which are created below.
 
-//-----------------------------------------------------------------------
-// Generate the series of actual package building jobs.
+        suite_name = "${manifest_file.tokenize(".")[0]}_${label}_py${py_version}"
+        folder(suite_name)
 
-for(pkg in config.packages) {
 
-    pipelineJob("${suite_name}/${pkg}") {
-        environmentVariables {
-            env("JOB_DEF_GENERATION_TIME", job_def_generation_time)
-        }
-        parameters {
-            stringParam("label",
-                        "label-DEFAULTVALUE",
-                        "The node on which to run.")
-            stringParam("build_control_repo",
-                        "build_control_repo-DEFAULTVALUE",
-                        "Repository containing the build system scripts.")
-            stringParam("build_control_branch",
-                        "build_control_branch-DEFAULTVALUE",
-                        "Branch checked out to obtain build system scripts.")
-            stringParam("py_version",
-                        "py_version-DEFAULTVALUE",
-                        "python version to use")
-            stringParam("numpy_version",
-                        "numpy_version-DEFAULTVALUE",
-                        "Version of numpy to use")
-            stringParam("parent_workspace",
-                        "parent_workspace-DEFAULTVALUE",
-                        "The workspace dir of the dispatch job")
-            stringParam("manifest_file",
-                        "manifest_file-DEFAULTVALUE",
-                        "Manifest (release) file to use for the build.")
-            stringParam("cull_manifest",
-                        "cull_manifest-DEFAULTVALUE",
-                        "Was the manifest culled as part of dispatch?")
-            stringParam("channel_URL",
-                        "channel_URL-DEFAULTVALUE",
-                        "Publication channel used for culled builds.")
-        }
-        definition {
-            cps {
-                script(readFileFromWorkspace("jenkins/package_builder.groovy"))
-                sandbox()
+        pipelineJob("${suite_name}/_${script.tokenize(".")[0]}") {
+            // At trigger-time, allow for setting manifest culling behavior.
+            parameters {
+                booleanParam("cull_manifest",
+                             true,
+                             "Whether or not package recipes that would generate a " +
+                             "package file name that already exists in the manfest's" +
+                             " channel archive are removed from the build list.")
+            }
+            println("\n" +
+            "script: ${this.script}\n" +
+            "MANIFEST_FILE: ${manifest_file}\n" +
+            "LABEL: ${label}\n" +
+            "LABELS: ${labels}\n" +
+            "PY_VERSION: ${py_version}\n" +
+            "BUILD_CONTROL_REPO: ${build_control_repo}\n" +
+            "BUILD_CONTROL_BRANCH: ${build_control_branch}\n" +
+            "CONDA_VERSION: ${conda_version}\n" +
+            "CONDA_BUILD_VERSION: ${conda_build_version}\n" +
+            "CONDA_BASE_URL: ${conda_base_URL}\n" +
+            "UTILS_REPO: ${utils_repo}\n")
+            environmentVariables {
+                env("JOB_DEF_GENERATION_TIME", job_def_generation_time)
+                env("SCRIPT", this.script)
+                env("MANIFEST_FILE", manifest_file)
+                env("LABEL", label)
+                env("PY_VERSION", py_version)
+                env("BUILD_CONTROL_REPO", build_control_repo)
+                env("BUILD_CONTROL_BRANCH", build_control_branch)
+                env("CONDA_VERSION", conda_version)
+                env("CONDA_BUILD_VERSION", conda_build_version)
+                env("CONDA_BASE_URL", conda_base_URL)
+                env("UTILS_REPO", utils_repo)
+            }
+            definition {
+                cps {
+                    script(readFileFromWorkspace("jenkins/${this.script}"))
+                    sandbox()
+                }
             }
         }
-    } // end pipelineJob
 
-} //end for(pkg...
 
+        //-----------------------------------------------------------------------
+        // Generate the series of actual package building jobs.
+
+        for(pkg in config.packages) {
+
+            pipelineJob("${suite_name}/${pkg}") {
+                environmentVariables {
+                    env("JOB_DEF_GENERATION_TIME", job_def_generation_time)
+                }
+                parameters {
+                    stringParam("label",
+                                "label-DEFAULTVALUE",
+                                "The node on which to run.")
+                    stringParam("build_control_repo",
+                                "build_control_repo-DEFAULTVALUE",
+                                "Repository containing the build system scripts.")
+                    stringParam("build_control_branch",
+                                "build_control_branch-DEFAULTVALUE",
+                                "Branch checked out to obtain build system scripts.")
+                    stringParam("py_version",
+                                "py_version-DEFAULTVALUE",
+                                "python version to use")
+                    stringParam("numpy_version",
+                                "numpy_version-DEFAULTVALUE",
+                                "Version of numpy to use")
+                    stringParam("parent_workspace",
+                                "parent_workspace-DEFAULTVALUE",
+                                "The workspace dir of the dispatch job")
+                    stringParam("manifest_file",
+                                "manifest_file-DEFAULTVALUE",
+                                "Manifest (release) file to use for the build.")
+                    stringParam("cull_manifest",
+                                "cull_manifest-DEFAULTVALUE",
+                                "Was the manifest culled as part of dispatch?")
+                    stringParam("channel_URL",
+                                "channel_URL-DEFAULTVALUE",
+                                "Publication channel used for culled builds.")
+                }
+                definition {
+                    cps {
+                        script(readFileFromWorkspace("jenkins/package_builder.groovy"))
+                        sandbox()
+                    }
+                }
+            } // end pipelineJob
+
+        } //end for(pkg...
+
+    } // end for(py_version
+} // end for(label