commit a0e52ebcf56ee144e5129e42b096ef191146abee
author Devin Lim <devin@opennetworking.org> Wed Sep 13 18:35:12 2017 -0700
committer Devin Lim <devin@opennetworking.org> Tue Sep 19 11:07:08 2017 -0700
tree d62243509adc9e40b28251b2f2c7b78c1bc2daf6
parent b96031bf7d2f8af5e74852063b85fe0fb6e30d9a

[ONOS-6957] Create Jenkins File for the other tests -- continue

Change-Id: Ic442c68db60f27d81b54fdaecea0eef91c19d34d

TestON/JenkinsFile/FUNCJenkinsFile

diff --git a/TestON/JenkinsFile/FUNCJenkinsFile b/TestON/JenkinsFile/FUNCJenkinsFile
index 51c613e..a27f0ad 100644
--- a/TestON/JenkinsFile/FUNCJenkinsFile
+++ b/TestON/JenkinsFile/FUNCJenkinsFile
@@ -56,6 +56,7 @@
                                  'WORKSPACE='+workSpace]){
                             sh '''#!/bin/bash -l
                             set -i # interactive
+                            set +e
                             shopt -s expand_aliases # expand alias in non-interactive mode
                             export PYTHONUNBUFFERED=1
 
@@ -83,7 +84,7 @@
 
                             // For the Wiki page
                             sh '''#!/bin/bash -i
-
+                            set +e
                             echo "ONOS Branch is: ${ONOSBranch}"
                             echo "TestON Branch is: ${TestONBranch}"
 
@@ -118,7 +119,6 @@
                                         def database_command = pass + "|psql --host=" + host + " --port=" + port + " --username=" + user + " --password --dbname onostest -c \"INSERT INTO " + table_name + " VALUES('\$DATE','" + result_name + "','" + testName + "',\$BUILD_NUMBER, '\$ONOSBranch', \$line);\""
 
                                         sh '''#!/bin/bash
-                                        set +e
                                         export DATE=\$(date +%F_%T)
                                         cd ~
                                         pwd
@@ -134,7 +134,7 @@
                             }
                             // Fetch Logs
                             sh '''#!/bin/bash
-
+                            set +e
                             cd ~/OnosSystemTest/TestON/logs
                             echo "Job Name is: " + ''' + testName + '''
                             TestONlogDir=$(ls -t | grep ${TEST_NAME}_  |head -1)