more fixes on Jenkins..
Change-Id: Ib02feed41a083ebac294e6c5198aeb2cd30f93c1
diff --git a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
index 3a2eddd..91ae7f0 100644
--- a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
@@ -71,14 +71,13 @@
catch( all ){}
}
def initAndRunTest( testName, testCategory ){
+ // after ifconfig : ''' + borrowCell( testName ) + '''
return '''#!/bin/bash -l
set -i # interactive
set +e
shopt -s expand_aliases # expand alias in non-interactive mode
export PYTHONUNBUFFERED=1
ifconfig
- ''' //+ borrowCell( testName )
- + '''
echo "ONOS Branch is: $ONOSBranch"
echo "TestON Branch is: $TestONBranch"
echo "Test date: "
diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index 6b205f5..f258324 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -365,9 +365,9 @@
// jobOn : "SCPF" or "USECASE" or "FUNC" or "HA"
return{
if( jobOn == "SR" ){
- trigger( "1.11", "SRBridging", nodeName, jobOn, manuallyRun, onosTag )
- trigger( "1.12", "SRBridging", nodeName, jobOn, manuallyRun, onosTag )
- trigger( "master", "SRBridging", nodeName, jobOn, manuallyRun, onosTag )
+ trigger( "1.11", tests, nodeName, jobOn, manuallyRun, onosTag )
+ trigger( "1.12", tests, nodeName, jobOn, manuallyRun, onosTag )
+ trigger( "master", tests, nodeName, jobOn, manuallyRun, onosTag )
// returnCell( nodeName )
}else{
trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag )
@@ -395,12 +395,11 @@
// Initialize the environment Setup for the onos and OnosSystemTest
def envSetup( onos_branch, test_branch, onos_tag, jobOn, manuallyRun ){
stage( "envSetup" ) {
+ // after env: ''' + borrow_mn( jobOn ) + '''
sh '''#!/bin/bash -l
set +e
. ~/.bashrc
env
- ''' //+ borrow_mn( jobOn )
- + '''
''' + preSetup( onos_branch, test_branch, onos_tag, manuallyRun ) + '''
''' + oldFlowCheck( jobOn, onos_branch ) + '''
''' + postSetup( onos_branch, test_branch, onos_tag, manuallyRun )
diff --git a/TestON/JenkinsFile/SRJenkinsFile b/TestON/JenkinsFile/SRJenkinsFile
index b3e2c0f..6e04cac 100644
--- a/TestON/JenkinsFile/SRJenkinsFile
+++ b/TestON/JenkinsFile/SRJenkinsFile
@@ -1,5 +1,5 @@
#!groovy
-funcs = evaluate readTrusted( 'JenkinsCommonFuncs.groovy' )
+funcs = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsCommonFuncs.groovy' )
funcs.initialize( "SR" );
// This is a Jenkinsfile for a scripted pipeline for the SR tests
def prop = null