From 9c948b7080834c91d52e0bf70b78aff0facda733 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 5 Sep 2017 17:27:35 -0400 Subject: Add numpy parameter to job suite generation 'matrix' --- jenkins/dispatch.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'jenkins/dispatch.groovy') diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 3e17ac1..9fcf805 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -101,6 +101,7 @@ node(LABEL) { "LABEL: ${LABEL}\n" + "env.NODE_NAME: ${env.NODE_NAME}\n" + "PY_VERSION: ${PY_VERSION}\n" + + "NUMPY_VERSION: ${NUMPY_VERSION}\n" + "MANIFEST_FILE: ${MANIFEST_FILE}\n" + "CONDA_VERSION: ${CONDA_VERSION}\n" + "CONDA_BUILD_VERSION: ${CONDA_BUILD_VERSION}\n" + @@ -237,8 +238,9 @@ node(LABEL) { 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}"), + //string(name: "numpy_version", + // value: "${this.manifest.numpy_version}"), + string(name: "numpy_version", value: NUMPY_VERSION), string(name: "parent_workspace", value: env.WORKSPACE), string(name: "cull_manifest", value: this.cull_manifest), string(name: "channel_URL", value: this.manifest.channel_URL)], -- cgit From 710d9b25ede86daa5b71cf82f09704da57d82d63 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Wed, 6 Sep 2017 11:18:42 -0400 Subject: Add numpy version argument to rambo call --- jenkins/dispatch.groovy | 1 + 1 file changed, 1 insertion(+) (limited to 'jenkins/dispatch.groovy') diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 9fcf805..c62d15c 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -212,6 +212,7 @@ node(LABEL) { cmd = "rambo" args = ["--platform ${this.CONDA_PLATFORM}", "--python ${PY_VERSION}", + "--numpy ${NUMPY_VERSION}", "--manifest manifests/${MANIFEST_FILE}", "--file ${build_list_file}", "${culled_option}", -- cgit From c8b8cda793ce3902ab1d1831959932730a398638 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Wed, 6 Sep 2017 11:30:16 -0400 Subject: Cleanup --- jenkins/dispatch.groovy | 2 -- 1 file changed, 2 deletions(-) (limited to 'jenkins/dispatch.groovy') diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index c62d15c..80cfe89 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -239,8 +239,6 @@ node(LABEL) { 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}"), string(name: "numpy_version", value: NUMPY_VERSION), string(name: "parent_workspace", value: env.WORKSPACE), string(name: "cull_manifest", value: this.cull_manifest), -- cgit