diff --git a/tests/CI/install_client.sh b/tests/CI/install_client.sh index 8e4409b6423..481e12ec267 100755 --- a/tests/CI/install_client.sh +++ b/tests/CI/install_client.sh @@ -59,29 +59,31 @@ echo -e "*** $(date -u) **** Client INSTALLATION START ****\n" installDIRAC -echo -e "*** $(date -u) Getting a non privileged user\n" |& tee -a clientTestOutputs.txt -dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt +if [[ -z "${INSTALLATION_BRANCH}" ]]; then + echo -e "*** $(date -u) Getting a non privileged user\n" |& tee -a clientTestOutputs.txt + dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt -#-------------------------------------------------------------------------------# -echo -e "*** $(date -u) **** Submit a job ****\n" + #-------------------------------------------------------------------------------# + echo -e "*** $(date -u) **** Submit a job ****\n" -echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";' > test.jdl -echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl -echo "]" >> test.jdl -dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt + echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";' > test.jdl + echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl + echo "]" >> test.jdl + dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt -#-------------------------------------------------------------------------------# -echo -e "*** $(date -u) **** add a file ****\n" + #-------------------------------------------------------------------------------# + echo -e "*** $(date -u) **** add a file ****\n" -echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn -base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}" -dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT -echo $? + echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn + base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}" + dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT + echo $? -#-------------------------------------------------------------------------------# -echo -e "*** $(date -u) **** Submit a job with an input ****\n" + #-------------------------------------------------------------------------------# + echo -e "*** $(date -u) **** Submit a job with an input ****\n" -echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";\n InputData = "/vo/test_lfn.txt";' > test_dl.jdl -echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl -echo "]" >> test_dl.jdl -dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt + echo -e '[\n Arguments = "Hello World";\n Executable = "echo";\n Site = "DIRAC.Jenkins.ch";\n InputData = "/vo/test_lfn.txt";' > test_dl.jdl + echo " JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl + echo "]" >> test_dl.jdl + dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt +fi diff --git a/tests/CI/run_tests.sh b/tests/CI/run_tests.sh index ca02b3fb345..b7040539a62 100755 --- a/tests/CI/run_tests.sh +++ b/tests/CI/run_tests.sh @@ -52,7 +52,7 @@ elif [[ "$INSTALLTYPE" == "client" ]]; then elif [[ "$INSTALLTYPE" == "pilot" ]]; then # shellcheck source=/dev/null - source "$WORKSPACE/PilotInstallDIR/bashrc" + source "$WORKSPACE/bashrc" # If not unset, assert will not trigger unset PYTHONOPTIMIZE set -o pipefail