From a826edb6858bfd7f20c2506c71dca7f110faeb2a Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 2 May 2017 12:39:44 -0400 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cb3c6b..bb32c59 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ automated conda package building system for the astroconda project. - `/jenkins` : Jenkins CI pipeline build script(s) ([Groovy](http://www.groovy-lang.org/)) - `/manifests` : Lists of conda package & metapackage recipes, and associated metadata for various astroconda release types ([YAML](http://yaml.org/)) - +- `/patches` : Patches to apply to conda machinery immediately after installation of conda to fix bugs that have not yet been corrected in available/applicable releases. -- cgit From ce31017f54d291be2f45a58c060daa802abeffd0 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 23 May 2017 13:36:22 -0400 Subject: Test tool installation --- jenkins/dispatch.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 4f5551b..312e9d1 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -118,6 +118,7 @@ node(LABEL) { // Get build utilities dir(this.utils_dir) { git url: UTILS_REPO + sh "python setup.py install" } // Check for the availability of a download tool and then use it @@ -170,7 +171,7 @@ node(LABEL) { culled_option = "" } def build_list_file = "build_list" - cmd = "${this.utils_dir}/rambo.py" + cmd = "rambo" args = ["--platform ${this.CONDA_PLATFORM}", "--python ${PY_VERSION}", "--manifest manifests/${MANIFEST_FILE}", -- cgit From f88ffdc460a4c543ebba39426b4ef36ec9768c8f Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 23 May 2017 13:52:43 -0400 Subject: Add env var changes from other branch --- jenkins/dispatch.groovy | 8 +++++++- jenkins/package_builder.groovy | 10 ++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 312e9d1..f123331 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -42,6 +42,10 @@ node(LABEL) { } assert uname != null + env.PYTHONPATH = "" + // Make the log files a bit more deterministic + env.PYTHONUNBUFFERED = "true" + // Delete any existing job workspace directory contents. // The directory deleted is the one named after the jenkins pipeline job. deleteDir() @@ -72,12 +76,14 @@ node(LABEL) { "OSverion: ${this.OSversion}\n" + "script: dispatch.groovy\n" + "env.WORKSPACE: ${env.WORKSPACE}\n" + + "PATH: ${PATH}\n" + + "PYTHONPATH: ${env.PYTHONPATH}\n" + + "PYTHONUNBUFFERED: ${env.PYTHONUNBUFFERED}\n" + " Job suite parameters:\n" + "LABEL: ${LABEL}\n" + "env.NODE_NAME: ${env.NODE_NAME}\n" + "PY_VERSION: ${PY_VERSION}\n" + "MANIFEST_FILE: ${MANIFEST_FILE}\n" + - "PATH: ${PATH}\n" + "CONDA_VERSION: ${CONDA_VERSION}\n" + "CONDA_BUILD_VERSION: ${CONDA_BUILD_VERSION}\n" + "CONDA_BASE_URL: ${CONDA_BASE_URL}\n" + diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy index 9f8625e..92fbae4 100644 --- a/jenkins/package_builder.groovy +++ b/jenkins/package_builder.groovy @@ -3,6 +3,9 @@ node(this.label) { dir(this.parent_workspace) { env.PATH = "${this.parent_workspace}/miniconda/bin/:" + "${env.PATH}" + env.PYTHONPATH = "" + // Make the log files a bit more deterministic + env.PYTHONUNBUFFERED = "true" def time = new Date() println("\n" + @@ -18,10 +21,9 @@ node(this.label) { "env.WORKSPACE: ${env.WORKSPACE}\n" + "env.JENKINS_HOME: ${env.JENKINS_HOME}\n" + "parameter py_version: ${this.py_version}\n" + - "PATH: ${env.PATH}\n") - - // Make the log files a bit more deterministic - env.PYTHONUNBUFFERED = "true" + "PATH: ${env.PATH}\n" + + "PYTHONPATH: ${env.PYTHONPATH}\n" + + "PYTHONUNBUFFERED: ${env.PYTHONUNBUFFERED}\n") // In the directory common to all package build jobs, // run conda build --dirty for this package to use any existing work -- cgit From e0888b607157fed223386eb7734c031964bf265c Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 23 May 2017 14:22:49 -0400 Subject: Adjust sequencing --- jenkins/dispatch.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index f123331..42b3535 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -124,7 +124,6 @@ node(LABEL) { // Get build utilities dir(this.utils_dir) { git url: UTILS_REPO - sh "python setup.py install" } // Check for the availability of a download tool and then use it @@ -155,7 +154,7 @@ node(LABEL) { // Install specific versions of miniconda and conda-build sh "bash ./${conda_installer} -b -p miniconda" - env.PATH = "${env.WORKSPACE}/miniconda/bin/:${env.PATH}" + env.PATH = "${env.WORKSPACE}/miniconda/bin:${env.PATH}" sh "conda install --quiet conda=${CONDA_VERSION}" sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" @@ -167,6 +166,8 @@ node(LABEL) { def full_patchname = "${patches_dir}/${patchname}" sh "patch ${filename} ${full_patchname}" + // Install support tools + sh "python setup.py install" } stage("Generate build list") { -- cgit From 0aad590b43c4adf1ed8cae42c200ec4beed69662 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 23 May 2017 14:45:59 -0400 Subject: Change working dir for installation --- jenkins/dispatch.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 42b3535..27a7606 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -167,7 +167,9 @@ node(LABEL) { sh "patch ${filename} ${full_patchname}" // Install support tools - sh "python setup.py install" + dir(this.utils_dir) { + sh "python setup.py install" + { } stage("Generate build list") { -- cgit From b44feaec760579b079938c79833d3d9a832d3529 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 23 May 2017 14:48:59 -0400 Subject: Fix typo --- jenkins/dispatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 27a7606..d671f28 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -169,7 +169,7 @@ node(LABEL) { // Install support tools dir(this.utils_dir) { sh "python setup.py install" - { + } } stage("Generate build list") { -- cgit