Clean up Jenkins
Change-Id: I8cce560528f163511358f48e664e6b31ea7cb177
diff --git a/TestON/JenkinsFile/SRJenkinsfileTrigger b/TestON/JenkinsFile/SRJenkinsfileTrigger
index 088f8ea..1d78828 100644
--- a/TestON/JenkinsFile/SRJenkinsfileTrigger
+++ b/TestON/JenkinsFile/SRJenkinsfileTrigger
@@ -58,7 +58,7 @@
post_result = params.PostResult
if( !manually_run ){
- slackSend( channel:'testing', color:'#03CD9F',
+ slackSend( channel:'sr-failures', color:'#03CD9F',
message:":sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles:\n"
+ "Starting tests on : " + now.toString()
+ "\n:sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles::sparkles:" )
diff --git a/TestON/JenkinsFile/TriggerFuncs.groovy b/TestON/JenkinsFile/TriggerFuncs.groovy
index 3952183..8cefc50 100644
--- a/TestON/JenkinsFile/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/TriggerFuncs.groovy
@@ -52,18 +52,14 @@
def trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag ){
println jobOn + "-pipeline-" + manuallyRun ? "manually" : branch
def wiki = branch
- print "HERE2.5:" + branch
- print "HERE4:" + wiki
branch = funcs.branchWithPrefix( branch )
test_branch = "master"
- print "HERE2:" + branch
node( "TestStation-" + nodeName + "s" ){
envSetup( branch, test_branch, onosTag, jobOn, manuallyRun )
exportEnvProperty( branch, test_branch, wiki, tests, post_result, manuallyRun, onosTag, isOldFlow )
}
- print "HERE5:" + wiki
jobToRun = jobOn + "-pipeline-" + ( manuallyRun ? "manually" : wiki )
build job: jobToRun, propagate: false
}
@@ -71,13 +67,11 @@
// nodeName : "BM" or "VM"
// jobOn : "SCPF" or "USECASE" or "FUNC" or "HA"
return{
- print "HERE:" + branch
trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag )
}
}
// export Environment properties.
def exportEnvProperty( onos_branch, test_branch, wiki, tests, postResult, manually_run, onosTag, isOldFlow ){
- print "HERE6:" + wiki
stage( "export Property" ){
sh '''
echo "ONOSBranch=''' + onos_branch +'''" > /var/jenkins/TestONOS.property
@@ -94,7 +88,6 @@
}
// Initialize the environment Setup for the onos and OnosSystemTest
def envSetup( onos_branch, test_branch, onos_tag, jobOn, manuallyRun ){
- print "HERE3:" + onos_branch
stage( "envSetup" ) {
// after env: ''' + borrow_mn( jobOn ) + '''
sh '''#!/bin/bash -l