diff options
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/dispatch.groovy | 6 | ||||
| -rw-r--r-- | jenkins/obsolete/astroconda_parameterized.groovy (renamed from jenkins/astroconda_parameterized.groovy) | 0 | ||||
| -rw-r--r-- | jenkins/package_builder.groovy | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index d671f28..f05d906 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -177,7 +177,7 @@ node(LABEL) { // of available package recipes. def culled_option = "--culled" if (this.cull_manifest == "false") { - culled_option = "" + culled_option = "" } def build_list_file = "build_list" cmd = "rambo" @@ -205,7 +205,9 @@ node(LABEL) { string(name: "py_version", value: PY_VERSION), string(name: "numpy_version", value: "${this.manifest.numpy_version}"), - string(name: "parent_workspace", value: env.WORKSPACE)], + string(name: "parent_workspace", value: env.WORKSPACE), + string(name: "cull_manifest", value: this.cull_manifest), + string(name: "channel_URL", value: this.manifest.channel_URL)], propagate: false } } diff --git a/jenkins/astroconda_parameterized.groovy b/jenkins/obsolete/astroconda_parameterized.groovy index 67932ae..67932ae 100644 --- a/jenkins/astroconda_parameterized.groovy +++ b/jenkins/obsolete/astroconda_parameterized.groovy diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy index 92fbae4..55784a3 100644 --- a/jenkins/package_builder.groovy +++ b/jenkins/package_builder.groovy @@ -12,7 +12,6 @@ node(this.label) { " Package Build Info Summary:\n" + "${time}\n" + "JOB_DEF_GENERATION_TIME: ${JOB_DEF_GENERATION_TIME}\n" + - "inherited workspace: ${this.parent_workspace}\n" + "this.Nodelabel: ${this.label}\n" + "env.JOB_BASE_NAME: ${env.JOB_BASE_NAME}\n" + "env.JOB_NAME: ${env.JOB_NAME}\n" + @@ -20,7 +19,11 @@ node(this.label) { "env.NODE_NAME: ${env.NODE_NAME}\n" + "env.WORKSPACE: ${env.WORKSPACE}\n" + "env.JENKINS_HOME: ${env.JENKINS_HOME}\n" + + "parameter parent_workspace: ${this.parent_workspace}\n" + "parameter py_version: ${this.py_version}\n" + + "parameter numpy_version: ${this.numpy_version}\n" + + "parameter cull_manifest: ${this.cull_manifest}\n" + + "parameter channel_URL: ${this.channel_URL}\n" + "PATH: ${env.PATH}\n" + "PYTHONPATH: ${env.PYTHONPATH}\n" + "PYTHONUNBUFFERED: ${env.PYTHONUNBUFFERED}\n") @@ -33,6 +36,15 @@ node(this.label) { cmd = "conda build" stage("Build") { + // Use channel URL obtained from manifest in build command if + // manifest has been culled to allow packages being built to + // simply download dependency packages from the publication + // channel as needed, rather than build them as part of the + // package build session that requires them. + def channel_option = "${this.channel_URL}" + if (this.cull_manifest == "false") { + channel_option = "" + } build_cmd = cmd args = ["--no-test", "--no-anaconda-upload", @@ -41,6 +53,7 @@ node(this.label) { "--skip-existing", "--override-channels", "--channel defaults", + "${channel_option}", "--dirty"] for (arg in args) { build_cmd = "${build_cmd} ${arg}" |