Fixing some Triggers
Change-Id: Ib1528765abc3feeca602dee5e897507382c64c15
diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index 4961a8b..d744a67 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -17,6 +17,7 @@
machineOn = [:]
for (machine in machineList){
+ print( machine )
machineOn[ machine ] = triggerJob( machine )
}
@@ -24,6 +25,8 @@
def triggerJob( on ){
- jobToRun = on + "-pipeline-trigger"
- build job: jobToRun, propagate: false
+ return{
+ jobToRun = on + "-pipeline-trigger"
+ build job: jobToRun, propagate: false
+ }
}
diff --git a/TestON/JenkinsFile/VM_BMJenkinsfileTrigger b/TestON/JenkinsFile/VM_BMJenkinsfileTrigger
index 17a4ccf..3d03048 100644
--- a/TestON/JenkinsFile/VM_BMJenkinsfileTrigger
+++ b/TestON/JenkinsFile/VM_BMJenkinsfileTrigger
@@ -97,10 +97,14 @@
}
}
def finalList = [:]
+jobName = env.JOB_NAME
finalList[ "VM" ] = triggerFuncs.runTestSeq( runTest[ "VM" ] )
finalList[ "BM" ] = triggerFuncs.runTestSeq( runTest[ "BM" ] )
-parallel finalList
-//finalList[ "BM" ].call()
+//parallel finalList
+if( jobName.take( 2 ) == "vm" )
+ finalList[ "VM" ].call()
+else
+ finalList[ "BM" ].call()
if ( !manually_run ){
funcs.generateStatGraph( "TestStation-VMs",