commit cdd177d0dcbab942fae5e350ce0afd9b8b131e67
author Jeremy Ronquillo <jeremyr@opennetworking.org> Fri Mar 09 16:55:44 2018 -0800
committer Jeremy Ronquillo <jeremyr@opennetworking.org> Fri Mar 09 16:55:44 2018 -0800
tree ed13f6962569545e138ada8dfea2418e61443bf5
parent 7961edcd6e9a4eda4f7b7b6257b4340dcb773355

minor fix to All Pipeline Trigger manual run

Change-Id: Ia4bec9ec5fc857ff0268fac87ae571c4ad889863

TestON/JenkinsFile/JenkinsfileTrigger

diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index 9ca9bbc..84fa15e 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -25,6 +25,7 @@
     "VP" : "USECASE"
 ]
 
+manually_run = params.manual_run
 onos_b = "master"
 test_branch = ""
 onos_tag = params.ONOSTag
@@ -35,10 +36,14 @@
 print now.toString()
 today = now[ Calendar.DAY_OF_WEEK ]
 
-if( today == Calendar.SATURDAY ){
-    onos_b = previous_version
-} else if( today == Calendar.SUNDAY ){
-    onos_b = before_previous_version
+if ( manually_run ){
+    onos_b = params.ONOSVersion
+} else {
+    if ( today == Calendar.SATURDAY ){
+        onos_b = previous_version
+    } else if( today == Calendar.SUNDAY ){
+        onos_b = before_previous_version
+    }
 }
 AllTheTests = test_lists.getAllTheTests( onos_b )
 
@@ -52,7 +57,6 @@
 pie_graph_generator_file = "testCategoryPiePassFail.R"
 graph_saved_directory = "/var/jenkins/workspace/postjob-VM/"
 
-manually_run = params.manual_run
 post_result = params.PostResult
 if( !manually_run ){
     slackSend( color:'#03CD9F',
@@ -69,7 +73,7 @@
 
 if ( manually_run ){
     organize_tests( params.Tests )
-    onos_b = params.ONOSVersion
+
     isOldFlow = params.isOldFlow
     println "Tests to be run manually : "
 }else{