Change branch names such as onos-1.x to onos-LTS1
Change-Id: If4eeeed2c04a3a0cfbaa824bbde97034cbdeb352
diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index f32fde9..ac0e4da 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -100,7 +100,7 @@
branch = params.Branch // "1.15", "2.1", "master", etc.
branchWithPrefix = test_list.addPrefixToBranch( branch )
testStation = params.TestStation // "TestStation-BMs", etc.
- nodeLabel = params.NodeLabel // "BM", "VM", "Fabric-1.x", etc.
+ nodeLabel = params.NodeLabel // "BM", "VM", "Fabric-LTS1", etc.
testsOverride = params.TestsOverride // "FUNCflow, FUNCintent, [...]", overrides property file
isGraphOnly = params.OnlyRefreshGraphs // true or false
}
diff --git a/TestON/JenkinsFile/MOJenkinsFile.groovy b/TestON/JenkinsFile/MOJenkinsFile.groovy
index 4b4b05c..4f03fcb 100644
--- a/TestON/JenkinsFile/MOJenkinsFile.groovy
+++ b/TestON/JenkinsFile/MOJenkinsFile.groovy
@@ -85,7 +85,7 @@
branch = params.Branch // "1.15", "2.1", "master", etc.
branchWithPrefix = test_list.addPrefixToBranch( branch )
testStation = params.TestStation // "TestStation-BMs", etc.
- nodeLabel = params.NodeLabel // "BM", "VM", "Fabric-1.x", etc.
+ nodeLabel = params.NodeLabel // "BM", "VM", "Fabric-LTS1", etc.
testsOverride = params.TestsOverride // "FUNCflow, FUNCintent, [...]", overrides property file
}
diff --git a/TestON/JenkinsFile/README.md b/TestON/JenkinsFile/README.md
index 9e304a3..acff4aa 100644
--- a/TestON/JenkinsFile/README.md
+++ b/TestON/JenkinsFile/README.md
@@ -16,15 +16,15 @@
The list of branches is located in `dependencies/branches.json`. The file is constructed in the following format:
- `"latest_branches"` - `dict` of the latest branches for each major ONOS version.
- - `"onos-1.x"` - Latest version of ONOS 1.x (ie: "1.15").
+ - `"onos-LTS1"` - Latest version of ONOS LTS1 (ie: "1.15").
- `...`
- `"support_branches"` - `dict` of other ONOS support branches that are not necessarily the latest branches.
- - `"onos-1.sb1"` - Support branch 1 of ONOS 1.x (ie: "1.12").
+ - `"onos-1.sb1"` - Support branch 1 of ONOS LTS1 (ie: "1.12").
- `...`
Note: Please avoid adding the `onos-` prefix as the value.
-- Correct: `"onos-1.x": 1.15,`
-- Incorrect: ~~`"onos-1.x": onos-1.15,`~~
+- Correct: `"onos-LTS1": 1.15,`
+- Incorrect: ~~`"onos-LTS1": onos-1.15,`~~
### Adding a Schedule
@@ -41,7 +41,7 @@
- `"wikiName"` - Name of the TestON test as it would appear on the ONOS wiki (this is usually identical to the `<test name>`).
- `"wikiFile"` - Filename of the text file that the ONOS wiki uses to display the test result summary.
- `"schedules"` - List of `dict` containing the following:
- - `"branch"` - ONOS branch label mapping from `branches.json`. (ie: "onos-1.x")
+ - `"branch"` - ONOS branch label mapping from `branches.json`. (ie: "onos-LTS1")
- `"day"` - Name of the schedule from `schedule.json` that this test runs on the given `"branch"` and `"nodeLabel"`. (ie: "weekdays")
- `"nodeLabel"` - Node label mapping from Jenkins specifying the node to run the test on (ie: "BM").
- `"category"` - Category of the test (ie: "FUNC").
diff --git a/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy b/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
index c2c03f4..d0b4c52 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
@@ -39,10 +39,10 @@
def getPostjobType( nodeL ){
switch ( nodeL ){
- case "Fabric-1.x":
+ case "Fabric-LTS1":
return "Fabric2"
break
- case "Fabric-2.x":
+ case "Fabric-LTS2":
return "Fabric3"
break
case "Fabric-master":
diff --git a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
index d62e114..eef8526 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
@@ -117,7 +117,7 @@
}
// Converts a branch code to an actual ONOS branch.
-// Example: converts onos-1.x to onos-1.15
+// Example: converts onos-LTS1 to onos-1.15
def convertBranchCodeToBranch( branch_code, withPrefix=true ){
for ( String branch_type in branches.keySet() ){
for ( String b in branches[ branch_type ].keySet() ){
@@ -129,16 +129,20 @@
return branch_code
}
-// given a branch, returns the corresponding branch code (hack)
-// Example: given "onos-1.15", returns "onos-1.x"
+// given a branch, returns the corresponding branch code
+// Example: given "onos-1.15", returns "onos-LTS1"
def convertBranchToBranchCode( branch ){
if ( branch == "master" ){
- return branch
- } else if ( branch.substring( 0, 1 ) == "o" ) {
- return branch.substring( 0, 6 ) + ".x"
- } else {
- return "onos-" + branch.substring( 0, 1 ) + ".x"
+ return branch
}
+ for ( String branch_type in branches.keySet() ){
+ for ( String b in branches[ branch_type ].keySet() ){
+ if ( branches[ branch_type ][ b ] == branch ){
+ return b
+ }
+ }
+ }
+ return "UNKNOWN"
}
// given a branch without a prefix, returns the branch with the "onos-" prefix
diff --git a/TestON/JenkinsFile/dependencies/branches.json b/TestON/JenkinsFile/dependencies/branches.json
index 0f65862..e23c23e 100644
--- a/TestON/JenkinsFile/dependencies/branches.json
+++ b/TestON/JenkinsFile/dependencies/branches.json
@@ -1,7 +1,7 @@
{
"latest_branches": {
- "onos-1.x": "1.15",
- "onos-2.x": "2.2"
+ "onos-LTS1": "1.15",
+ "onos-LTS2": "2.2"
},
"support_branches": {
"onos-1.sb1": "1.12",
diff --git a/TestON/JenkinsFile/dependencies/schedule.json b/TestON/JenkinsFile/dependencies/schedule.json
index 5193b1e..1ff705c 100644
--- a/TestON/JenkinsFile/dependencies/schedule.json
+++ b/TestON/JenkinsFile/dependencies/schedule.json
@@ -13,12 +13,12 @@
"thu": [ "thu" ],
"fri": [ "fri" ],
"sat": [ "sat" ],
- "onos-1.x_schedule": [ "sat" ],
- "onos-2.x_schedule": [ "sun" ],
+ "onos-LTS1_schedule": [ "sat" ],
+ "onos-LTS2_schedule": [ "sun" ],
"USECASE_master": [ "tue" ],
"SR_schedule": [ "sun", "mon", "tue", "wed", "thu", "sat" ],
- "SR_1.x_schedule": [ "mon", "thu" ],
- "SR_2.x_schedule": [ "tue", "sat" ],
+ "SR_LTS1_schedule": [ "mon", "thu" ],
+ "SR_LTS2_schedule": [ "tue", "sat" ],
"SR_master_schedule": [ "wed", "sun" ],
"none": []
}
diff --git a/TestON/JenkinsFile/dependencies/tests.json b/TestON/JenkinsFile/dependencies/tests.json
index 4cf63aa..b7e83e8 100644
--- a/TestON/JenkinsFile/dependencies/tests.json
+++ b/TestON/JenkinsFile/dependencies/tests.json
@@ -9,13 +9,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -32,13 +32,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -55,13 +55,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -78,13 +78,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -101,13 +101,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -124,13 +124,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -147,13 +147,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -170,13 +170,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -193,13 +193,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -216,13 +216,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -239,13 +239,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -262,13 +262,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -285,13 +285,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -308,13 +308,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -331,13 +331,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -354,13 +354,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -377,13 +377,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -400,13 +400,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -439,13 +439,13 @@
"nodeLabel": "VM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "VM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "VM"
}
],
@@ -460,13 +460,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -481,13 +481,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -502,13 +502,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -525,13 +525,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -546,13 +546,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -569,13 +569,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -590,13 +590,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -613,13 +613,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -634,13 +634,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -655,13 +655,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -678,13 +678,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -699,13 +699,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -734,13 +734,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -755,13 +755,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -776,13 +776,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -799,14 +799,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -822,14 +822,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -845,14 +845,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -868,14 +868,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -891,14 +891,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -914,14 +914,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "fri",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "fri",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -937,14 +937,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "fri",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "fri",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -960,14 +960,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "fri",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "fri",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -983,14 +983,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "fri",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "fri",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1006,14 +1006,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "sat",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "sat",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1029,14 +1029,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "sat",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "sat",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1052,14 +1052,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "sat",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "sat",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1077,14 +1077,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1101,14 +1101,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1126,14 +1126,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1151,14 +1151,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1176,14 +1176,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "fri",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "fri",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1201,14 +1201,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "sat",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "sat",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1226,14 +1226,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
+ "branch": "onos-LTS1",
"day": "sat",
- "nodeLabel": "Fabric-1.x"
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "sat",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1251,14 +1251,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1276,14 +1276,14 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-1.x",
- "day": "SR_1.x_schedule",
- "nodeLabel": "Fabric-1.x"
+ "branch": "onos-LTS1",
+ "day": "SR_LTS1_schedule",
+ "nodeLabel": "Fabric-LTS1"
},
{
- "branch": "onos-2.x",
- "day": "SR_2.x_schedule",
- "nodeLabel": "Fabric-2.x"
+ "branch": "onos-LTS2",
+ "day": "SR_LTS2_schedule",
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR",
@@ -1321,13 +1321,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SRRouting-stratum": {
"test": "SRRouting",
@@ -1341,13 +1341,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SRDynamicConf-stratum": {
"test": "SRDynamicConf",
@@ -1361,13 +1361,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SRLinkFailure-stratum": {
"test": "SRLinkFailure",
@@ -1381,13 +1381,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SROnosFailure-stratum": {
"test": "SROnosFailure",
@@ -1401,13 +1401,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SRBridging-stratum": {
"test": "SRBridging",
@@ -1421,13 +1421,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "weekdays",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-StratumBMv2",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"SRBridging-tofino": {
"test": "SRBridging",
@@ -1441,13 +1441,13 @@
"nodeLabel": "Fabric-master"
},
{
- "branch": "onos-2.x",
+ "branch": "onos-LTS2",
"day": "none",
- "nodeLabel": "Fabric-2.x"
+ "nodeLabel": "Fabric-LTS2"
}
],
"category": "SR-Tofino",
- "supportedBranches": [ "onos-2.x", "master" ]
+ "supportedBranches": [ "onos-LTS2", "master" ]
},
"FUNCvirNetNB": {
"wikiName": "FUNCvirNetNB",
@@ -1459,13 +1459,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1482,13 +1482,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1505,13 +1505,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1528,13 +1528,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1551,13 +1551,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1574,13 +1574,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
@@ -1597,13 +1597,13 @@
"nodeLabel": "BM"
},
{
- "branch": "onos-1.x",
- "day": "onos-1.x_schedule",
+ "branch": "onos-LTS1",
+ "day": "onos-LTS1_schedule",
"nodeLabel": "BM"
},
{
- "branch": "onos-2.x",
- "day": "onos-2.x_schedule",
+ "branch": "onos-LTS2",
+ "day": "onos-LTS2_schedule",
"nodeLabel": "BM"
}
],
diff --git a/TestON/JenkinsFile/generateWikiTestList.groovy b/TestON/JenkinsFile/generateWikiTestList.groovy
index 6ee9328..b17a8b6 100644
--- a/TestON/JenkinsFile/generateWikiTestList.groovy
+++ b/TestON/JenkinsFile/generateWikiTestList.groovy
@@ -34,8 +34,8 @@
def main(){
test_list.init()
- supportBranch1 = test_list.convertBranchCodeToBranch( "onos-1.x" )
- supportBranch2 = test_list.convertBranchCodeToBranch( "onos-2.x" )
+ supportBranch1 = test_list.convertBranchCodeToBranch( "onos-LTS1" )
+ supportBranch2 = test_list.convertBranchCodeToBranch( "onos-LTS2" )
initHtmlForWiki()
initTestCategoryContents()
@@ -129,7 +129,7 @@
}
// adds asterisks based on the support branch number (hack)
-// Example: if support branch is onos-1.x, then adds 1 asterisks, if onos-2.x, then adds 2 asterisks
+// Example: if support branch is onos-LTS1, then adds 1 asterisks, if ONOS-LTS2, then adds 2 asterisks
def addAsterisks( category, day, test ){
asterisks = ""
tempDict = [ test : testCategoryContents[ category ][ day ][ test ] ]
@@ -137,8 +137,11 @@
asteriskCount = 0
for ( branch in testBranches ){
- if ( branch.substring( 0, 1 ) != "m" ){
- asteriskCount += branch.substring( 0, 1 ) as Integer
+ branch_code = test_list.convertBranchToBranchCode( branch )
+ if ( branch_code == "onos-LTS1" ) {
+ asteriskCount += 1
+ } else if ( branch_code == "onos-LTS2" ) {
+ asteriskCount += 2
}
}