Skip to content

Commit efb2294

Browse files
fstagnifstagni
committed
test: run all integration tests
1 parent 20730a0 commit efb2294

3 files changed

Lines changed: 26 additions & 38 deletions

File tree

‎tests/CI/install_client.sh‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,33 @@ echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"
5858

5959
installDIRAC
6060

61-
if [[ -z "${INSTALLATION_BRANCH}" ]]; then
62-
echo 'Generate a pilot proxy, to be used by the pilot'
63-
dirac-proxy-init -g pilot -C /ca/certs/pilot.pem -K /ca/certs/pilot.key "${DEBUG}"
64-
mv /tmp/x509up_u$UID /ca/certs/pilot_proxy
61+
echo 'Generate a pilot proxy, to be used by the pilot'
62+
dirac-proxy-init -g pilot -C /ca/certs/pilot.pem -K /ca/certs/pilot.key "${DEBUG}"
63+
mv /tmp/x509up_u$UID /ca/certs/pilot_proxy
6564

66-
echo -e "*** $(date -u) Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
67-
dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt
65+
echo -e "*** $(date -u) Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
66+
dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt
6867

69-
#-------------------------------------------------------------------------------#
70-
echo -e "*** $(date -u) **** Submit a job ****\n"
68+
#-------------------------------------------------------------------------------#
69+
echo -e "*** $(date -u) **** Submit a job ****\n"
7170

72-
echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";' > test.jdl
73-
echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl
74-
echo "]" >> test.jdl
75-
dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
71+
echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";' > test.jdl
72+
echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl
73+
echo "]" >> test.jdl
74+
dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
7675

77-
#-------------------------------------------------------------------------------#
78-
echo -e "*** $(date -u) **** add a file ****\n"
76+
#-------------------------------------------------------------------------------#
77+
echo -e "*** $(date -u) **** add a file ****\n"
7978

80-
echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn
81-
base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}"
82-
dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT
83-
echo $?
79+
echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn
80+
base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}"
81+
dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT
82+
echo $?
8483

85-
#-------------------------------------------------------------------------------#
86-
echo -e "*** $(date -u) **** Submit a job with an input ****\n"
84+
#-------------------------------------------------------------------------------#
85+
echo -e "*** $(date -u) **** Submit a job with an input ****\n"
8786

88-
echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";\n InputData = "/vo/test_lfn.txt";' > test_dl.jdl
89-
echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl
90-
echo "]" >> test_dl.jdl
91-
dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
92-
fi
87+
echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";\n InputData = "/vo/test_lfn.txt";' > test_dl.jdl
88+
echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl
89+
echo "]" >> test_dl.jdl
90+
dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt

‎tests/CI/run_pilot.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ set -x
1111
echo "Starting run_pilot.sh"
1212
source CONFIG
1313

14-
if [[ -n "${INSTALLATION_BRANCH}" ]]; then
15-
# Do not run this
16-
echo "Not running the DIRAC Pilot"
17-
exit
18-
fi
19-
2014
# Creating "the worker node"
2115
mkdir -p /home/dirac/etc/grid-security/certificates
2216
mkdir -p /home/dirac/etc/grid-security/vomsdir

‎tests/Integration/all_integration_client_tests.sh‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ pytest --no-check-dirac-environment "${THIS_DIR}/ResourceStatusSystem/Test_Email
5656
echo -e "*** $(date -u) **** WMS TESTS ****\n"
5757

5858
pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_SandboxStoreClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
59-
if [[ -z "${INSTALLATION_BRANCH}" ]]; then
60-
pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_PilotsClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
61-
pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_Client_WMS.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
62-
fi
59+
pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_PilotsClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
60+
pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_Client_WMS.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
6361

6462
# Make sure we have the prod role for these tests to get the VmRpcOperator permission
6563
dirac-proxy-init -g prod "${DEBUG}" |& tee -a clientTestOutputs.txt
@@ -72,9 +70,7 @@ python "${THIS_DIR}/WorkloadManagementSystem/createJobXMLDescriptions.py" |& tee
7270
#-------------------------------------------------------------------------------#
7371
echo -e "*** $(date -u) **** MONITORING TESTS ****\n"
7472
pytest --no-check-dirac-environment "${THIS_DIR}/Monitoring/Test_MonitoringSystem.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
75-
if [[ -z "${INSTALLATION_BRANCH}" ]]; then
76-
pytest --no-check-dirac-environment "${THIS_DIR}/Monitoring/Test_WebAppClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
77-
fi
73+
pytest --no-check-dirac-environment "${THIS_DIR}/Monitoring/Test_WebAppClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
7874

7975
#-------------------------------------------------------------------------------#
8076
echo -e "*** $(date -u) **** TS TESTS ****\n"

0 commit comments

Comments
 (0)