commit f29368da2800d1e11fc5b15af8d872b7e9ec15de
author Jon Hall <jhall@ciena.com> Fri Jul 31 12:23:56 2020 -0700
committer Jon Hall <jhall@ciena.com> Fri Jul 31 13:36:09 2020 -0700
tree 2b81f2ff58c27b6727d6d7d5f9df0635a16fd701
parent aa1d9b84ae6dba777c9097d463985fc57d353079

Avoid errors from empty variables

- Make sure vairables are initialized as empty maps instead of None
- Fix some style issues

Change-Id: I39d3bea85af25e264ee560f7ceba492adc364887

TestON/JenkinsFile/CommonJenkinsFile.groovy

diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 763f8d9..54cec80 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -29,7 +29,6 @@
 
 category = null
 prop = null
-testsToRun = null
 testsToRunStrList = null
 branch = null
 branchWithPrefix = null
@@ -41,6 +40,7 @@
 isSCPF = false
 pipelineTimeout = null
 
+testsToRun = [:]
 testsFromList = [:]
 graphPaths = [:]
 pipeline = [:]
@@ -141,7 +141,7 @@
         toBeRun = testsToRun.keySet().contains( JenkinsLabel )
         stepName = ( toBeRun ? "" : "Not " ) + "Running $JenkinsLabel"
 
-        TestONTest = testsToRun[ JenkinsLabel ].keySet().contains( "test" ) ? testsToRun[ JenkinsLabel ][ "test" ] : JenkinsLabel
+        TestONTest = ( toBeRun && testsToRun[ JenkinsLabel ].keySet().contains( "test" ) ) ? testsToRun[ JenkinsLabel ][ "test" ] : JenkinsLabel
 
         pipeline[ stepName ] = runTest( JenkinsLabel,
                                         toBeRun,