diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-11-28 10:53:37 -0500 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-11-28 10:53:37 -0500 |
| commit | 22cc0965316b704c2186776cbdca121f2f8ab4c8 (patch) | |
| tree | fff145b24b400b545b016cbfcc1616db4454c50e | |
| parent | b5264e531a9066959369d907cbeee9c05c333893 (diff) | |
| download | jscu_refactor-22cc0965316b704c2186776cbdca121f2f8ab4c8.tar.gz | |
Remove some experimentation debris
| -rw-r--r-- | src/BuildConfig.groovy | 6 | ||||
| -rw-r--r-- | vars/utils.groovy | 28 |
2 files changed, 9 insertions, 25 deletions
diff --git a/src/BuildConfig.groovy b/src/BuildConfig.groovy index 20e75d5..2487a45 100644 --- a/src/BuildConfig.groovy +++ b/src/BuildConfig.groovy @@ -1,6 +1,7 @@ // src/BuildConfig.groovy package BuildConfig; +//@AutoClone // annotation is not CPS-compatible? class BuildConfig implements Serializable { def nodetype = "" def build_mode = "" @@ -31,8 +32,3 @@ class BuildConfig implements Serializable { } } } - -//class bconfig implements Serializable { -// def name = "My name" -//} - diff --git a/vars/utils.groovy b/vars/utils.groovy index 620ba2a..69713fc 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -29,40 +29,28 @@ def scm_checkout() { return skip_job } -class TClass implements Serializable { - def var = "varvalue" -} - -def concurrent2(configs) { +def concurrent(configs) { def tasks = [:] println("Size of configs = ${configs.size()}") for (config in configs) { - t = new TClass() - println("concurrent2: build.nodetype = ${config.nodetype}") - println("concurrent2: build.build_mode= ${config.build_mode}") - println("concurrent2: build.build_args= ${config.build_args}") - println("concurrent2: build.env_vars= ${config.env_vars}") - def run_tests = config.run_tests def myconfig = new BuildConfig() myconfig = config.copy() tasks["${config.nodetype}/${config.build_mode}"] = { node(config.nodetype) { //withEnv(config.env_vars) { - println("task: build.nodetype = ${myconfig.nodetype}") - println("task: build.build_mode= ${myconfig.build_mode}") - println("task: build.build_args= ${myconfig.build_args}") - println("task: build.env_vars= ${myconfig.env_vars}") - println("task: config.run_tests = ${myconfig.run_tests}") - println("task: run_tests = ${run_tests}") + println("task: myconfig.nodetype = ${myconfig.nodetype}") + println("task: myconfig.build_mode = ${myconfig.build_mode}") + println("task: myconfig.build_args = ${myconfig.build_args}") + println("task: myconfig.env_vars = ${myconfig.env_vars}") + println("task: myconfig.run_tests = ${myconfig.run_tests}") def prefix = pwd() + "/_install" stage("Build (${myconfig.build_mode})") { unstash "source_tree" sh(script: "ls -al") } //end stage stage("Test (${myconfig.build_mode})") { - //if (config.run_tests) { - if (run_tests) { + if (myconfig.run_tests) { println("RUNNING TESTS") } } @@ -73,7 +61,7 @@ def concurrent2(configs) { stage("Matrix") { parallel(tasks) } -} //end concurrent2 +} //end concurrent // Allow deep copying of a config object to another instance. def copy(config) { |