Merge "Several fixes to SRMulticast - Add host discovery and location verifications - Flush arp entries before host discovery - Update mcast join and delete commands"
diff --git a/TestON/JenkinsFile/TriggerFuncs.groovy b/TestON/JenkinsFile/TriggerFuncs.groovy
index 8cefc50..96c0855 100644
--- a/TestON/JenkinsFile/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/TriggerFuncs.groovy
@@ -97,6 +97,7 @@
''' + preSetup( onos_branch, test_branch, onos_tag, manuallyRun ) + '''
''' + oldFlowCheck( jobOn, onos_branch ) + '''
''' + postSetup( onos_branch, test_branch, onos_tag, manuallyRun )
+ generateKey()
}
}
def tagCheck( onos_tag, onos_branch ){
@@ -169,10 +170,23 @@
echo -e "\n##### Stop all running instances of Karaf #####"
kill $(ps -efw | grep karaf | grep -v grep | awk '{print $2}')
sleep 30
- git branch'''
+ git branch
+ '''
}
return result
}
+def generateKey(){
+ try{
+ sh '''
+ #!/bin/bash -l
+ set +e
+ . ~/.bashrc
+ env
+ onos-push-bits-through-proxy
+ onos-gen-cluster-key -f
+ '''
+ }catch( all ){}
+}
def returnCell( nodeName ){
node( "TestStation-" + nodeName + "s" ){
sh '''#!/bin/bash -l