commit bd26bdbb5027c910aebcb78298440238592bc335
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon Jul 08 16:15:45 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon Jul 08 16:15:45 2019 -0700
tree c4a5492230fdbcb1711725ad02bab2f907761ac6
parent 593e5005a6cd393f689617004dd8656128706a01

Fix for manually running tests on support branches in Jenkins Pipelines

Change-Id: Iebd5fa8c2dc50c6f5075bf7b41229a65e66a49c5

TestON/JenkinsFile/MasterTrigger.groovy

diff --git a/TestON/JenkinsFile/MasterTrigger.groovy b/TestON/JenkinsFile/MasterTrigger.groovy
index 4c1fcad..463a3d8 100644
--- a/TestON/JenkinsFile/MasterTrigger.groovy
+++ b/TestON/JenkinsFile/MasterTrigger.groovy
@@ -208,7 +208,7 @@
                 filteredList = [:]
                 for ( key in selectedNodeLabelCategoryTests.keySet() ){
                     for ( sch in selectedNodeLabelCategoryTests[ key ][ "schedules" ] ){
-                        if ( validSchedules.contains( sch[ "day" ] ) && sch[ "branch" ] == test_list.convertBranchToBranchCode( branch ) ){
+                        if ( validSchedules.contains( sch[ "day" ] ) && sch[ "branch" ] == test_list.convertBranchToBranchCode( branch ) || manually_run ){
                             filteredList.put( key, selectedNodeLabelCategoryTests[ key ] )
                             break
                         }

TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 4e01437..9437b61 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -261,7 +261,11 @@
     // post the result by triggering postjob.
     // prop : property dictionary that was read from the machine.
     // graphOnly : if it is graph generating job
+
     if ( graphOnly ){
+        if ( machine == null ){
+            machine = machineType[ testType ]
+        }
         def post = build job: "postjob-" + machine, propagate: false
     } else if ( isPostingResult( prop[ "manualRun" ], prop[ "postResult" ] ) ){
         def post = build job: "postjob-" + machineType[ testType ], propagate: false