Merge "Add host verifications before installing multicast routes in SRMulticast"
diff --git a/TestON/JenkinsFile/FabricJenkinsfileTrigger b/TestON/JenkinsFile/FabricJenkinsfileTrigger
index aa4bfe0..da75805 100644
--- a/TestON/JenkinsFile/FabricJenkinsfileTrigger
+++ b/TestON/JenkinsFile/FabricJenkinsfileTrigger
@@ -97,7 +97,7 @@
}
}
}else{
- runTest[ "Fabric2" ][ "SR1" ] = triggerFuncs.trigger_pipeline( current_version, testcases[ "SR1" ][ "tests" ], testcases[ "SR1" ][ "nodeName" ][ 0 ], "SR1", manually_run, onos_tag )
+ runTest[ "Fabric2" ][ "SR1" ] = triggerFuncs.trigger_pipeline( current_version, testcases[ "SR1" ][ "tests" ], testcases[ "SR1" ][ "nodeName" ][ 0 ], "SR", manually_run, onos_tag )
runTest[ "Fabric2" ][ "SR" ] = triggerFuncs.trigger_pipeline( previous_version, testcases[ "SR" ][ "tests" ], testcases[ "SR" ][ "nodeName" ][ 0 ], "SR", manually_run, onos_tag )
runTest[ "Fabric3" ][ "SR" ] = triggerFuncs.trigger_pipeline( before_previous_version, testcases[ "SR" ][ "tests" ], testcases[ "SR" ][ "nodeName" ][ 1 ], "SR", manually_run, onos_tag )
}
@@ -133,4 +133,4 @@
}
def nodeOn( branch ){
return branch == "1.12" ? 1 : 0;
-}
\ No newline at end of file
+}
diff --git a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
index ea4eccd..fd7253b 100644
--- a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
@@ -46,8 +46,7 @@
print testMachine
}
def fabricOn( branch ){
- return branch.reverse().take(4).reverse() == "1.13" ? '2' : '3'
-// Temp Fix return branch.reverse().take(6).reverse() == "master" ? '2' : '3'
+ return branch.reverse().take(4).reverse() == "1.12" ? '3' : '2'
}
def printType(){
echo testType;
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",