commit f252790a47c1a28bd9753d0622caf3d03f0a9696
author Jon Hall <jhall@ciena.com> Thu Jul 30 12:56:08 2020 -0700
committer Jon Hall <jhall@ciena.com> Thu Jul 30 12:56:08 2020 -0700
tree 508459c0f7a064f7a869e73362ca49e5aea96a4a
parent 926cdbdfef15b9df262b42b4294d42ef547848c7

Fix some wiki reporting for jobname != testname

Change-Id: I855d13189d460a7ffac968e11ea2e80e2fb2a9e4

TestON/JenkinsFile/generateReleaseTestONWiki.groovy

diff --git a/TestON/JenkinsFile/generateReleaseTestONWiki.groovy b/TestON/JenkinsFile/generateReleaseTestONWiki.groovy
index db9ea71..2f7e51d 100644
--- a/TestON/JenkinsFile/generateReleaseTestONWiki.groovy
+++ b/TestON/JenkinsFile/generateReleaseTestONWiki.groovy
@@ -316,6 +316,12 @@
             testTrendPrefix = "https://jenkins.onosproject.org/view/QA/job/postjob-Fabric3/lastSuccessfulBuild/artifact/"
             overallTrendHTML = ""
             break
+        case "SR-StratumBmv2":
+            title = "Segment Routing (SR) with Stratum BMv2 switches"
+            testPlanLink = "https://wiki.opencord.org/display/CORD/Test+Plan+-+Fabric+Control"
+            testTrendPrefix = "https://jenkins.onosproject.org/view/QA/job/postjob-Fabric3/lastSuccessfulBuild/artifact/"
+            overallTrendHTML = ""
+            break
         case "USECASE":
             title = "USECASE"
             testPlanLink = "https://wiki.onosproject.org/pages/viewpage.action?pageId=4163047"

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

diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.stratum b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.stratum
index f230714..c7d0305 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.stratum
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.stratum
@@ -5,6 +5,7 @@
     <GRAPH>
         <nodeCluster>Fabric</nodeCluster>
         <builds>20</builds>
+        <jobName>SRBridging-stratum</jobName>
     </GRAPH>
 
     <SCALE>

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 c512f4e..633f3c2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
@@ -4,6 +4,7 @@
     <GRAPH>
         <nodeCluster>Fabric</nodeCluster>
         <builds>20</builds>
+        <jobName>SRBridging-tofino</jobName>
     </GRAPH>
 
     <SCALE>

TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum

diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
index a20adb6..b285c8f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
@@ -4,6 +4,7 @@
     <GRAPH>
         <nodeCluster>Fabric</nodeCluster>
         <builds>20</builds>
+        <jobName>SRDhcprelay-stratum</jobName>
     </GRAPH>
 
     <SCALE>

TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.stratum

diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.stratum b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.stratum
index 1490932..aff3842 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.stratum
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.stratum
@@ -4,6 +4,7 @@
     <GRAPH>
         <nodeCluster>Fabric</nodeCluster>
         <builds>20</builds>
+        <jobName>SRRouting-stratum</jobName>
     </GRAPH>
 
     <SCALE>

TestON/tests/dependencies/ONOSSetup.py

diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index 0a00fd7..ad2de22 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -130,19 +130,21 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        url = self.generateGraphURL()
+        if main.params[ 'GRAPH' ].get('jobName'):
+            url = self.generateGraphURL( testname=main.params[ 'GRAPH' ][ 'jobName' ] )
+        else:
+            url = self.generateGraphURL()
         main.log.wiki( url )
 
         main.commit = main.ONOSbench.getVersion( report=True )
 
-    def generateGraphURL( self, width=525, height=350 ):
+    def generateGraphURL( self, testname=main.TEST, width=525, height=350 ):
         """
         Description:
             Obtain the URL for the graph that corresponds to the test being run.
         """
 
         nodeCluster = main.params[ 'GRAPH' ][ 'nodeCluster' ]
-        testname = main.TEST
         branch = main.ONOSbench.getBranchName()
         maxBuildsToShow = main.params[ 'GRAPH' ][ 'builds' ]