[ONOS-7617]
Change-Id: Ic9cd92412689e9524659e5deda48ebdfbe6ac947
diff --git a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
index b6a39b7..9fb887a 100644
--- a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
@@ -46,7 +46,8 @@
print testMachine
}
def fabricOn( branch ){
- return branch == "master" ? '2' : '3'
+ return branch == "s-1.13" ? '2' : '3'
+// Temp Fix return branch == "master" ? '2' : '3'
}
def printType(){
echo testType;
diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index 31d606a..cedd001 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -4,8 +4,8 @@
test_lists = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsTestONTests.groovy' )
triggerFuncs = evaluate readTrusted( 'TestON/JenkinsFile/TriggerFuncs.groovy' )
-previous_version = "1.12"
-before_previous_version = "1.11"
+previous_version = "1.13"
+before_previous_version = "1.13"
funcs.initializeTrend( "VM" );
triggerFuncs.init( funcs )
wikiContents = ""
@@ -28,7 +28,7 @@
]
manually_run = params.manual_run
-onos_b = "master"
+onos_b = "1.13"
test_branch = ""
onos_tag = params.ONOSTag
isOldFlow = true
@@ -388,7 +388,7 @@
wikiContents += '''
</tbody>
</table>
- <p><strong>Everyday</strong>, all SegmentRouting tests are built and run on every branch.</p>
+ <p><strong>Everyday</strong>, all SegmentRouting tests are built and run on every supported branch.</p>
<p>On <strong>Weekdays</strong>, all the other tests are built and run on the master branch.</p>
<p>On <strong>Saturdays</strong>, all the other tests are built and run on the '''+ funcs.branchWithPrefix( previous_version ) +''' branch.</p>
<p>On <strong>Sundays</strong>, all the other tests are built and run on the '''+ funcs.branchWithPrefix( before_previous_version ) +''' branch.</p>'''
diff --git a/TestON/JenkinsFile/SRJenkinsfileTrigger b/TestON/JenkinsFile/SRJenkinsfileTrigger
index 1d78828..98d2bd6 100644
--- a/TestON/JenkinsFile/SRJenkinsfileTrigger
+++ b/TestON/JenkinsFile/SRJenkinsfileTrigger
@@ -4,7 +4,7 @@
test_lists = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsTestONTests.groovy' )
triggerFuncs = evaluate readTrusted( 'TestON/JenkinsFile/TriggerFuncs.groovy' )
-current_version = "master"
+current_version = "1.13"
previous_version = "1.12"
before_previous_version = "1.11"
funcs.initializeTrend( "Fabric" );
@@ -31,7 +31,7 @@
]
manually_run = params.manual_run
-onos_b = "master"
+onos_b = current_version
test_branch = ""
onos_tag = params.ONOSTag
isOldFlow = true
@@ -124,4 +124,4 @@
}
}
return result
-}
\ No newline at end of file
+}