diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-06-12 14:07:39 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-06-13 09:59:33 -0400 |
| commit | efac703de5f64218c992746218149affadc92726 (patch) | |
| tree | 17b06cf139d478157b0908f62231b9bf6d4a46b7 | |
| parent | eb16bc4d7aeb00e77e8c1f130243bac1fb9b55fa (diff) | |
| download | build_control-efac703de5f64218c992746218149affadc92726.tar.gz | |
Propagate repo and branch names to all job logs
| -rw-r--r-- | jenkins/dispatch.groovy | 4 | ||||
| -rw-r--r-- | jenkins/generator_DSL.groovy | 6 | ||||
| -rw-r--r-- | jenkins/job-suite-generator.groovy | 3 | ||||
| -rw-r--r-- | jenkins/package_builder.groovy | 4 |
4 files changed, 17 insertions, 0 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 6d37274..1d42053 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -48,6 +48,8 @@ node(LABEL) { // Make the log files a bit more deterministic env.PYTHONUNBUFFERED = "true" + sh "printenv" + // Delete any existing job workspace directory contents. // The directory deleted is the one named after the jenkins pipeline job. deleteDir() @@ -208,6 +210,8 @@ node(LABEL) { build job: pkg, parameters: [string(name: "label", value: env.NODE_NAME), + string(name: "build_control_repo", value: BUILD_CONTROL_REPO), + string(name: "build_control_branch", value: BUILD_CONTROL_BRANCH), string(name: "py_version", value: PY_VERSION), string(name: "numpy_version", value: "${this.manifest.numpy_version}"), diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy index 4c9c14c..f74275c 100644 --- a/jenkins/generator_DSL.groovy +++ b/jenkins/generator_DSL.groovy @@ -82,6 +82,12 @@ for(pkg in config.packages) { 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") diff --git a/jenkins/job-suite-generator.groovy b/jenkins/job-suite-generator.groovy index 7f58297..5d32e51 100644 --- a/jenkins/job-suite-generator.groovy +++ b/jenkins/job-suite-generator.groovy @@ -17,6 +17,9 @@ this.dsl_script = "jenkins/generator_DSL.groovy" node("master") { stage("Prep") { + + sh "printenv" + // Delete any existing job workspace directory contents. deleteDir() diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy index be868b0..97c2c45 100644 --- a/jenkins/package_builder.groovy +++ b/jenkins/package_builder.groovy @@ -10,6 +10,8 @@ node(this.label) { env.PYTHONUNBUFFERED = "true" def time = new Date() + sh "printenv" + println("\n" + " Package Build Info Summary:\n" + "${time}\n" + @@ -21,6 +23,8 @@ node(this.label) { "env.NODE_NAME: ${env.NODE_NAME}\n" + "env.WORKSPACE: ${env.WORKSPACE}\n" + "env.JENKINS_HOME: ${env.JENKINS_HOME}\n" + + "parameter build_control_repo: ${this.build_control_repo}\n" + + "parameter build_control_branch: ${this.build_control_branch}\n" + "parameter parent_workspace: ${this.parent_workspace}\n" + "parameter py_version: ${this.py_version}\n" + "parameter numpy_version: ${this.numpy_version}\n" + |