diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-11-29 12:28:45 -0500 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-11-29 12:28:45 -0500 |
| commit | 967c812751ffc395e07eb2d43fde0463902af45d (patch) | |
| tree | bc719d42ca90ea8f0222d0be897657575666d9d5 | |
| parent | 7c76d281dbb567f5340deeaa2bbb9fa373610662 (diff) | |
| download | jscu_refactor-967c812751ffc395e07eb2d43fde0463902af45d.tar.gz | |
Test env var expansion
| -rw-r--r-- | vars/utils.groovy | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/vars/utils.groovy b/vars/utils.groovy index 02bd5a8..4133af3 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -42,8 +42,15 @@ def concurrent(configs) { node(config.nodetype) { println("**** WORKSPACE = ${env.WORKSPACE}") // FIXME: Generalize env vars. - env.PATH = "${env.WORKSPACE}/_install/bin:${env.PATH}" - withEnv(myconfig.env_vars) { + for (var in myconfig.env_vars) { + if (var.contains("PATH")) { + cwd = pwd() + tvar = var.replace(".", cwd)env.PATH}" + env.PATH = "${tvar}:${env.PATH}" + } + } + //env.PATH = "${env.WORKSPACE}/_install/bin:${env.PATH}" + //withEnv(myconfig.env_vars) { //withEnv(vars) { println("task: env.PATH = ${env.PATH}") println("task: myconfig.nodetype = ${myconfig.nodetype}") @@ -76,7 +83,7 @@ def concurrent(configs) { tools: [[$class: 'JUnitType', pattern: '*.xml']]]) } } - } //end withEnv + //} //end withEnv } // end node } //end tasks |