commit 7633c38fa134cef4bb36c8a8799ff8e62d073d3f
author Jon Hall <jhall@ciena.com> Tue Dec 15 17:30:42 2020 -0800
committer Jon Hall <jhall@opennetworking.org> Thu Jan 07 22:43:00 2021 +0000
tree b6449b78c137b4610aa1fc55fbb7c995e5929320
parent c5b4c1c750e0070fec7b358718686466869f48b3

Add ability to specify branch when creating graphs

- This is useful if we don't control what version is deployed from the
  test

Change-Id: I25e39480538d76b73664cdcf2c49f3770eeb9bc3
(cherry picked from commit dd5ca963c429dbaac0664e60344f05cf9e8ec038)

TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino

diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
index 7442bf4..88d669b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
@@ -5,6 +5,7 @@
         <nodeCluster>Fabric</nodeCluster>
         <builds>20</builds>
         <jobName>SRBridging-tofino</jobName>
+        <branch>master</branch>
     </GRAPH>
 
     <SCALE>

TestON/tests/dependencies/ONOSSetup.py

diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index 1afbfa9..03275a1 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -132,11 +132,12 @@
                                  onpass="Successfully construct " +
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
+        branch = main.params[ 'GRAPH' ].get('branch')
 
         if main.params[ 'GRAPH' ].get('jobName'):
-            url = self.generateGraphURL( testname=main.params[ 'GRAPH' ][ 'jobName' ] )
+            url = self.generateGraphURL( testname=main.params[ 'GRAPH' ][ 'jobName' ], branch=branch )
         else:
-            url = self.generateGraphURL()
+            url = self.generateGraphURL( branch=branch )
         main.log.wiki( url )
 
         if not main.persistentSetup:
@@ -145,14 +146,15 @@
             #       Or try to link to deployment job?
             main.commit = main.ONOSbench.getVersion( report=True )
 
-    def generateGraphURL( self, testname=main.TEST, width=525, height=350 ):
+    def generateGraphURL( self, testname=main.TEST, width=525, height=350, branch=None ):
         """
         Description:
             Obtain the URL for the graph that corresponds to the test being run.
         """
 
         nodeCluster = main.params[ 'GRAPH' ][ 'nodeCluster' ]
-        branch = main.ONOSbench.getBranchName()
+        if not branch:
+            branch = main.ONOSbench.getBranchName()
         maxBuildsToShow = main.params[ 'GRAPH' ][ 'builds' ]
 
         return '<ac:structured-macro ac:name="html">\n' + \