From a99d596c230cfc0dab392a2809586a22e87f369b Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Fri, 1 Dec 2017 11:35:13 -0500 Subject: Test map inclusion, simplified --- vars/utils.groovy | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'vars') diff --git a/vars/utils.groovy b/vars/utils.groovy index f7677e5..cfe47a2 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -52,20 +52,20 @@ def concurrent(configs) { for (var in myconfig.env_vars_map) { paths = var.value.tokenize(":") - for (path in paths) { - if (path =~ /\$.*:|\$.*/) { - subvar = path[1..-1] - var_exists = sh(script: "[ ! -z ${subvar} ]", returnStatus: true) - if (var_exists) { - println("${subvar} exists in all vars.") - var_value = sh(script: "echo ${subvar}", returnStdout: true) - expanded = var.replaceAll(subvar, var_value) - println("REPLACED SUBVAR: ${expanded}") - } - } - def cpath = new File("${env.WORKSPACE}", var.value).getCanonicalPath() - println("task: cpath = ${cpath}") - } + //for (path in paths) { + // if (path =~ /\$.*:|\$.*/) { + // subvar = path[1..-1] + // var_exists = sh(script: "[ ! -z ${subvar} ]", returnStatus: true) + // if (var_exists) { + // println("${subvar} exists in all vars.") + // var_value = sh(script: "echo ${subvar}", returnStdout: true) + // expanded = var.replaceAll(subvar, var_value) + // println("REPLACED SUBVAR: ${expanded}") + // } + // } + // def cpath = new File("${env.WORKSPACE}", var.value).getCanonicalPath() + // println("task: cpath = ${cpath}") + //} } println("task: env.PATH = ${env.PATH}") println("task: myconfig.nodetype = ${myconfig.nodetype}") -- cgit