Skip to content
Snippets Groups Projects
Commit 65bbdfff authored by Chris Burr's avatar Chris Burr
Browse files

Fix Test_dirac-jobexecLHCb.sh for Python 3

parent 41017eae
No related branches found
No related tags found
No related merge requests found
......@@ -36,7 +36,7 @@ python "${THIS_DIR}/createJobXMLDescriptionsLHCb.py" $DEBUG
# OK
echo -e "\n==> jobDescriptionLHCb-OK.xml"
$DIRACSCRIPTS/dirac-jobexec jobDescriptionLHCb-OK.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
dirac-jobexec jobDescriptionLHCb-OK.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
ret_code=$?
if [ $ret_code -eq 0 ]
then
......@@ -50,7 +50,7 @@ fi
# OK2
echo -e "\n==> jobDescriptionLHCb-multiSteps-OK.xml"
$DIRACSCRIPTS/dirac-jobexec jobDescriptionLHCb-multiSteps-OK.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
dirac-jobexec jobDescriptionLHCb-multiSteps-OK.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
ret_code=$?
if [ $ret_code -eq 0 ]
then
......@@ -65,7 +65,7 @@ fi
# # FAIL
echo -e "\n==> jobDescriptionLHCb-FAIL.xml"
$DIRACSCRIPTS/dirac-jobexec jobDescriptionLHCb-FAIL.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
dirac-jobexec jobDescriptionLHCb-FAIL.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
ret_code=$?
# for lb-run specific errors (e.g. 111 like here) we reschedule even for user jobs (LHCbScript)
# (exit code 1502 becomes 222 --- 1502 & 255 (0xDE))
......@@ -81,7 +81,7 @@ fi
# # FAIL2
echo -e "\n==> jobDescriptionLHCb-multiSteps-FAIL.xml"
$DIRACSCRIPTS/dirac-jobexec jobDescriptionLHCb-multiSteps-FAIL.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
dirac-jobexec jobDescriptionLHCb-multiSteps-FAIL.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
ret_code=$?
# for lb-run specific errors (e.g. 111 like here) we reschedule even for user jobs (LHCbScript)
if [ $ret_code -eq 222 ]
......@@ -97,7 +97,7 @@ fi
# FAIL with exit code > 255
echo -e "\n==> jobDescriptionLHCb-FAIL1502.xml"
$DIRACSCRIPTS/dirac-jobexec jobDescriptionLHCb-FAIL1502.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
dirac-jobexec jobDescriptionLHCb-FAIL1502.xml --cfg "${THIS_DIR}/../../../../DIRAC/tests/Integration/WorkloadManagementSystem/pilot.cfg" $DEBUG
ret_code=$?
if [ $ret_code -eq 222 ] # This is 1502 & 255 (0xDE)
then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment