fixing exit status in pybot executions
Change-Id: Ibaa6251a6a57ddaf2cb522fc4e113fc9f221bec8
diff --git a/Jenkinsfile-rcordlite b/Jenkinsfile-rcordlite
index c7e876e..2f96139 100644
--- a/Jenkinsfile-rcordlite
+++ b/Jenkinsfile-rcordlite
@@ -111,8 +111,7 @@
export KUBECONFIG=/home/cord/${deployment_config.pod_config}
cd /home/cord/cord-tester/src/test/robot/
rm -rf Log/ || true
- pybot -d Log -T SanityK8POD.robot || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T SanityK8POD.robot || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -134,9 +133,8 @@
sed -i \"s/^\\(XOS_PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
cd /home/cord/cord-tester/src/test/cord-api/Tests
rm -rf Log/ || true
- pybot -d Log -T VOLTDevice_Test.txt || all_passed=false
- pybot -d Log -T RCORDLite_E2ETest.txt || all_passed=false
- if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T VOLTDevice_Test.txt || true
+ pybot -d Log -T RCORDLite_E2ETest.txt || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
diff --git a/Jenkinsfile-rcordlite-topdown b/Jenkinsfile-rcordlite-topdown
index f911cc8..c7cc429 100644
--- a/Jenkinsfile-rcordlite-topdown
+++ b/Jenkinsfile-rcordlite-topdown
@@ -125,8 +125,7 @@
export KUBECONFIG=/home/cord/${deployment_config.pod_config}
cd /home/cord/cord-tester/src/test/robot/
rm -rf Log/ || true
- pybot -d Log -T SanityK8POD.robot || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T SanityK8POD.robot || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -193,8 +192,7 @@
export KUBECONFIG=/home/cord/${deployment_config.pod_config}
cd /home/cord/cord-tester/src/test/robot/
rm -rf Log/ || true
- pybot -d Log -T SanityK8POD.robot || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T SanityK8POD.robot || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -211,11 +209,10 @@
sed -i \"s/^\\(XOS_PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
cd /home/cord/cord-tester/src/test/cord-api/Tests/
rm -rf Log/ || true
- pybot -d Log -T FabricConfig.txt || all_passed=false
- pybot -d Log -T RealOLT_Test.txt || all_passed=false
+ pybot -d Log -T FabricConfig.txt || true
+ pybot -d Log -T RealOLT_Test.txt || true
sleep 120
- pybot -d Log -T Subscriber_TopDown.txt || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T Subscriber_TopDown.txt || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -225,7 +222,7 @@
sh """
if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs;
mkdir RobotLogs/TestDoc || true
- //cp -r /home/cord/cord-tester/src/test/robot/Log/* ./RobotLogs || true
+ cp -r /home/cord/cord-tester/src/test/robot/Log/* ./RobotLogs || true
cp -r /home/cord/cord-tester/src/test/cord-api/Tests/Log/* ./RobotLogs || true
"""
step([$class: 'RobotPublisher',
diff --git a/Jenkinsfile-rcordlite-zerotouch b/Jenkinsfile-rcordlite-zerotouch
index 73f6291..22edfdb 100644
--- a/Jenkinsfile-rcordlite-zerotouch
+++ b/Jenkinsfile-rcordlite-zerotouch
@@ -171,8 +171,7 @@
export KUBECONFIG=/home/cord/${deployment_config.pod_config}
cd /home/cord/cord-tester/src/test/robot/
rm -rf Log/ || true
- pybot -d Log -T SanityK8POD.robot || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T SanityK8POD.robot || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -189,11 +188,10 @@
sed -i \"s/^\\(XOS_PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
cd /home/cord/cord-tester/src/test/cord-api/Tests/
rm -rf Log/ || true
- pybot -d Log -T FabricConfig.txt || all_passed=false
- pybot -d Log -T HippieOSS.txt || all_passed=false
- pybot -d Log -T OSSVolt.txt || all_passed=false
- pybot -d Log -T RealOLT_Test.txt || all_passed=false
- #if [ "\\\$all_passed" = true ]; then exit 0; else exit 1; fi
+ pybot -d Log -T FabricConfig.txt || true
+ pybot -d Log -T HippieOSS.txt || true
+ pybot -d Log -T OSSVolt.txt || true
+ pybot -d Log -T RealOLT_Test.txt || true
"""
} catch(error) { currentBuild.result = 'FAILURE' }
}
@@ -203,7 +201,7 @@
sh """
if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs;
mkdir RobotLogs/TestDoc || true
- //cp -r /home/cord/cord-tester/src/test/robot/Log/* ./RobotLogs || true
+ cp -r /home/cord/cord-tester/src/test/robot/Log/* ./RobotLogs || true
cp -r /home/cord/cord-tester/src/test/cord-api/Tests/Log/* ./RobotLogs || true
"""
step([$class: 'RobotPublisher',