Add schedules for testing onos-2.1
Change-Id: I7c8534c3009806e66e2d1f556e8e48084b0e1544
diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 7474285..68d75e9 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -83,7 +83,7 @@
def additionalInitForSR( branch ){
// additional setup for SegmentRouting tests to determine the machine depends on the branch it is running.
- // branch : branch of the onos. ( master, 2.0, 1.15... )
+ // branch : branch of the onos. ( master, 2.1, 1.15... )
testMachine = ( ( new StringBuilder( testMachine ) ).insert( testMachine.size() - 1, fabricOn( branch ) ) ).
toString()
@@ -98,10 +98,11 @@
def fabricOn( branch ){
// gets the fabric machines with the branch of onos.
- // branch : master, 2.0, 1.15...
+ // branch : master, 2.1, 1.15...
// branch.reverse().take(4).reverse() will get last 4 characters of the string.
switch ( branch.reverse().take( 3 ).reverse() ){
case "ter": return "4"
+ case "2.1": return "3"
case "2.0": return "3"
case ".15": return "2"
case ".14": return "3"
@@ -299,7 +300,7 @@
def postLogs( testName, prefix ){
// posting logs of the onos jobs specifically SR tests
// testName : name of the test
- // prefix : branch prefix ( master, 2.0, 1.15 ... )
+ // prefix : branch prefix ( master, 2.1, 1.15 ... )
resultURL = ""
if ( testType == "SR" ){
@@ -468,7 +469,7 @@
// stat_file : file name with full path for Rscript for the stat graph
// pie_file : file name with full path for Rscript for the pie graph
// type : type of the test ( USECASE, FUNC, HA )
- // branch : branch of the test ( master, onos-2.0, onos-1.15 )
+ // branch : branch of the test ( master, onos-2.1, onos-1.15 )
// testListPart : list of the test to be included
// save_path : path that will save the graphs to
// pieTestListPart : list of the test for pie graph
@@ -597,6 +598,8 @@
return "onos-1.15"
else if ( branch == "2.0" )
return "onos-2.0"
+ else if ( branch == "2.1" )
+ return "onos-2.1"
else
return "master"
}