diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2019-02-13 16:51:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 16:51:45 -0500 |
| commit | b18a2555e6e6a83514897b042747d987760fe01c (patch) | |
| tree | f77f4cae049f5c6a79376ec7d0d6f10237c76b05 | |
| parent | 477c44df4495996b196e3566f32eab7b4a7d209d (diff) | |
| download | jscu_refactor-b18a2555e6e6a83514897b042747d987760fe01c.tar.gz | |
Determine correct conda path before dumping environment (#34)1.3.4
| -rw-r--r-- | Jenkinsfile.test | 4 | ||||
| -rw-r--r-- | vars/utils.groovy | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Jenkinsfile.test b/Jenkinsfile.test index b8d40b1..320a16f 100644 --- a/Jenkinsfile.test +++ b/Jenkinsfile.test @@ -1,3 +1,5 @@ +@Library('utils@master') _ + if (utils.scm_checkout(['skip_disable':true])) return def PYTEST = "pytest \ @@ -13,7 +15,7 @@ bc0 = new BuildConfig() bc0.nodetype = 'master' bc0.name = 'First' bc0.conda_packages = ['python=3.6', - 'pytest=3.8.2'] + 'pytest'] bc0.build_cmds = ["ls -al", "date"] bc0.test_cmds = ["printenv | sort", diff --git a/vars/utils.groovy b/vars/utils.groovy index 21d765c..9847f0a 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -417,8 +417,16 @@ def buildAndTest(config, index) { } // end test test_cmd finally clause } // end if(config.test_cmds...) + // Dump the conda environment definition to a file. - sh(script: "${env.WORKSPACE}/miniconda/bin/conda list --explicit > env_dump_${index}.txt") + def conda_exe = '' + local_conda = "${env.WORKSPACE}/miniconda/bin/conda" + if (fileExists(local_conda)) { + conda_exe = local_conda + } else { + conda_exe = sh(script:"which conda", returnStdout:true).trim() + } + sh(script: "${conda_exe} list --explicit > env_dump_${index}.txt") } // end withEnv } |