Add Fabric HA tests to Jenkins
Change-Id: Id48bb961e24b18c65d7542b2744d567bb06c60f8
diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 9cf5e7b..7a0fd9a 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -38,6 +38,7 @@
testMachine = "TestStation-" + machine + "s"
this.machine = machine
isSCPF = false
+ hasArgs = false
isTrend = true
}
@@ -49,6 +50,7 @@
init( type )
SCPFfunc = SCPFfuncs
isSCPF = true
+ hasArgs = true // Has TestON cli arguments to be added when running the test
machine = machineType[ type ]
}
@@ -63,6 +65,7 @@
trend_generator_file = fileRelated.trendMultiple
build_stats_generator_file = fileRelated.histogramMultiple
isSCPF = false
+ hasArgs = false
}
def init( type ){
@@ -188,10 +191,10 @@
timeout 240 stc teardown | head -100
timeout 240 stc shutdown | head -100
cd ~/OnosSystemTest/TestON/bin
- git log |head
+ git log | head
./cleanup.sh -f
''' + "./cli.py run " +
- ( !isSCPF ? testName : testCategory[ testName ][ 'test' ] ) +
+ ( !hasArgs ? testName : testCategory[ testName ][ 'test' ] ) +
" --params GRAPH/nodeCluster=" + machineType[ testType ] + '''
./cleanup.sh -f
# cleanup config changes
@@ -367,7 +370,7 @@
// prop : dictionary property on the machine
// pureTestName : Pure name of the test. ( ex. pureTestName of SCPFflowTpFobj will be SCPFflowTp )
// graphOnly : check if it is generating graph job. If so, it will only generate the generating graph part
- // testCategory : category of the test ( SCPF, SR, FUNC ... )
+ // testCategory : Map for the test suit ( SCPF, SR, FUNC, ... ) which contains information about the tests
// graph_generator_file : Rscript file with the full path.
// graph_saved_directory : where the generated graph will be saved to.
diff --git a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
index b98fad2..8c998fd 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
@@ -499,6 +499,107 @@
"day": "",
wiki_link: wikiPrefix + "-" + "SR High Availability",
wiki_file: "SRHighAvailabilityWiki.txt" ]
+ ],
+ "SRHA": [
+ "SRHAsanity": [
+ "test": "HAsanity --params-file HAsanity.params.fabric",
+ "basic": true,
+ "extra_A": false,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Sanity",
+ wiki_file: "HAsanityWiki.txt" ],
+ "SRHAclusterRestart": [
+ "test": "HAclusterRestart --params-file HAclusterRestart.params.fabric",
+ "basic": true,
+ "extra_A": false,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Cluster Restart",
+ wiki_file: "HAclusterRestartWiki.txt" ],
+ "SRHAsingleInstanceRestart": [
+ "test": "HAsingleInstanceRestart --params-file HAsingleInstanceRestart.params.fabric",
+ "basic": true,
+ "extra_A": false,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Single Instance Restart",
+ wiki_file: "HAsingleInstanceRestartWiki.txt" ],
+ "SRHAstopNodes": [
+ "test": "HAstopNodes --params-file HAstopNodes.params.fabric",
+ "basic": true,
+ "extra_A": true,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Stop Nodes",
+ wiki_file: "HAstopNodes.txt" ],
+ "SRHAfullNetPartition": [
+ "test": "HAfullNetPartition --params-file HAfullNetPartition.params.fabric",
+ "basic": false,
+ "extra_A": true,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Full Network Partition",
+ wiki_file: "HAfullNetPartitionWiki.txt" ],
+ "SRHAswapNodes": [
+ "test": "HAswapNodes --params-file HAswapNodes.params.fabric",
+ "basic": false,
+ "extra_A": false,
+ "extra_B": true,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Swap Nodes",
+ wiki_file: "HAswapNodesWiki.txt" ],
+ "SRHAscaling": [
+ "test": "HAscaling --params-file HAscaling.params.fabric",
+ "basic": false,
+ "extra_A": false,
+ "extra_B": true,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Scaling",
+ wiki_file: "HAscalingWiki.txt" ],
+ "SRHAkillNodes": [
+ "test": "HAkillNodes --params-file HAkillNodes.params.fabric",
+ "basic": true,
+ "extra_A": false,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Kill Nodes",
+ wiki_file: "HAkillNodes.txt" ],
+ "SRHAbackupRecover": [
+ "test": "HAbackupRecover --params-file HAbackupRecover.params.fabric",
+ "basic": true,
+ "extra_A": false,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Backup Recover",
+ wiki_file: "HAbackupRecoverWiki.txt" ],
+ "SRHAupgrade": [
+ "test": "HAupgrade --params-file HAupgrade.params.fabric",
+ "basic": false,
+ "extra_A": false,
+ "extra_B": true,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Upgrade",
+ wiki_file: "HAupgradeWiki.txt" ],
+ "SRHAupgradeRollback": [
+ "test": "HAupgradeRollback --params-file HAupgradeRollback.params.fabric",
+ "basic": false,
+ "extra_A": true,
+ "extra_B": false,
+ "new_Test": false,
+ "day": "",
+ wiki_link: wikiPrefix + "-" + "SR HA Upgrade Rollback",
+ wiki_file: "HAupgradeRollbackWiki.txt" ]
]
]
}
diff --git a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
index 07ea98b..1670449 100644
--- a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
@@ -106,7 +106,6 @@
test_branch = "master"
node( "TestStation-" + nodeName + "s" ) {
envSetup( branch, test_branch, onosTag, jobOn, manuallyRun )
-
exportEnvProperty( branch, test_branch, wiki, tests, post_result, manuallyRun, onosTag, isOldFlow )
}