fix: run server tests without a proxy

Author: fstagni

tests/Integration/all_integration_client_tests.sh

@@ -20,6 +20,11 @@ pytest --no-check-dirac-environment "${THIS_DIR}/AccountingSystem/Test_DataStore
 pytest --no-check-dirac-environment "${THIS_DIR}/AccountingSystem/Test_ReportsClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
 
 
+#-------------------------------------------------------------------------------#
+echo -e "*** $(date -u)  **** FTS TESTS ****\n"
+pytest --no-check-dirac-environment "${THIS_DIR}/DataManagementSystem/Test_Client_FTS3.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+
+
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u)  **** RMS TESTS ****\n"
 

tests/Integration/all_integration_server_tests.sh

@@ -74,8 +74,8 @@ dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTP
 
 echo -e "*** $(date -u)  Run the DFC client tests as user without admin privileges" |& tee -a "${SERVER_TEST_OUTPUT}"
 echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a "${SERVER_TEST_OUTPUT}"
-dirac-login -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}"
-python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+# dirac-login -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}"
+# python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 diracDFCDB |& tee -a "${SERVER_TEST_OUTPUT}"
 python "${THIS_DIR}/DataManagementSystem/Test_FileCatalogDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
@@ -86,21 +86,16 @@ echo -e "*** $(date -u)  Restart the DFC service (required for Test_Client_DFC)\
 if [[ "${TEST_HTTPS:-Yes}" = "No" ]]; then
   dirac-restart-component DataManagement FileCatalog "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
 fi
-dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
+# dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
 
 echo -e "*** $(date -u)  Run it with the admin privileges" |& tee -a "${SERVER_TEST_OUTPUT}"
 echo -e "*** $(date -u)  getting the prod role again\n" |& tee -a "${SERVER_TEST_OUTPUT}"
-dirac-login prod -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
-python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+# dirac-login prod -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
+# python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 diracDFCDB |& tee -a "${SERVER_TEST_OUTPUT}"
 python "${THIS_DIR}/DataManagementSystem/Test_FileCatalogDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
 
-#-------------------------------------------------------------------------------#
-echo -e "*** $(date -u)  **** FTS TESTS ****\n"
-# I know, it says Client, but it also instantiates a DB, so it needs to be here
-pytest --no-check-dirac-environment "${THIS_DIR}/DataManagementSystem/Test_Client_FTS3.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
-
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u)  **** RMS TESTS ****\n"
 pytest --no-check-dirac-environment "${THIS_DIR}/RequestManagementSystem/Test_ReqDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))

tests/Jenkins/dirac_ci.sh

@@ -126,7 +126,6 @@ installSite() {
   echo "source \"$PWD/diracos/diracosrc\"" > "$PWD/bashrc"
 
   mkdir -p "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/"
-  mkdir -p "${SERVERINSTALLDIR}/user/"
 
   echo "==> CAs and certificates"
 
@@ -144,10 +143,6 @@ installSite() {
   # will be wrong on the client
   ln -s "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/ca.cert.pem" "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/$caHash.0"
 
-  # # Copy the user cert and key to the correct directory
-  # cp /ca/certs/client.pem "${SERVERINSTALLDIR}/user/"
-  # cp /ca/certs/client.key "${SERVERINSTALLDIR}/user/"
-
   rm -rf "${SERVERINSTALLDIR}/etc"
   ln -s "${SERVERINSTALLDIR}/diracos/etc" "${SERVERINSTALLDIR}/etc"
   source diracos/diracosrc
@@ -231,11 +226,6 @@ fullInstallDIRAC() {
     cat "${SERVERINSTALLDIR}/diracos/etc/Production.cfg"
   fi
 
-  # if ! diracCredentials; then
-  #   echo "ERROR: diracCredentials failed" >&2
-  #   exit 1
-  # fi
-
   #just add a site
   if ! diracAddSite; then
     echo "ERROR: diracAddSite failed" >&2

tests/Jenkins/utilities.sh

@@ -248,9 +248,6 @@ installDIRAC() {
   echo "export X509_CERT_DIR=\"$PWD/diracos/etc/grid-security/certificates\"" >> "$PWD/bashrc"
   source diracos/diracosrc
 
-  # Copy the user cert and key to the correct directory
-  # cp /ca/certs/client.pem "${SERVERINSTALLDIR}/user/"
-  # cp /ca/certs/client.key "${SERVERINSTALLDIR}/user/"
   cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
   cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
 
@@ -395,8 +392,7 @@ diracCredentials() {
   echo '==> [diracCredentials]'
 
   sed -i 's/commitNewData = CSAdministrator/commitNewData = authenticated/g' "${SERVERINSTALLDIR}/etc/Configuration_Server.cfg"
-  if ! dirac-proxy-init dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" --valid 72:00; then
-  # if ! dirac-login dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" -T 72; then
+  if ! dirac-proxy-init dirac_admin --nocs "${DEBUG}" --valid 72:00; then
     echo 'ERROR: dirac-proxy-init failed' >&2
     exit 1
   fi
@@ -541,10 +537,6 @@ diracServices(){
 
   local services=$(cut -d '.' -f 1 < services | grep -v StorageElementHandler | grep -v ^ConfigurationSystem | grep -v RAWIntegrity | grep -v RunDBInterface | grep -v ComponentMonitoring | sed 's/System / /g' | sed 's/Handler//g' | sed 's/ /\//g')
 
-  # group proxy, will be uploaded explicitly
-  #  echo '==> getting/uploading proxy for prod'
-  #  dirac-proxy-init -U -g prod -C ${SERVERINSTALLDIR}/user/client.pem -K ${SERVERINSTALLDIR}/user/client.key "${DEBUG}"
-
   for serv in $services; do
     echo "==> calling dirac-install-component $serv -o /DIRAC/Security/UseServerCertificate=True ${DEBUG}"
     if ! dirac-install-component "$serv" -o /DIRAC/Security/UseServerCertificate=True "${DEBUG}"; then
@@ -596,10 +588,6 @@ diracUninstallServices(){
   # Ignore tornado services
   local services=$(cut -d '.' -f 1 < services | grep -v TokenManager | grep -v ^ConfigurationSystem | grep -v RAWIntegrity | grep -v RunDBInterface | grep -v ComponentMonitoring | grep -v Tornado | sed 's/System / /g' | sed 's/Handler//g' | sed 's/ /\//g')
 
-  # group proxy, will be uploaded explicitly
-  #  echo '==> getting/uploading proxy for prod'
-  #  dirac-proxy-init -U -g prod -C ${SERVERINSTALLDIR}/user/client.pem -K ${SERVERINSTALLDIR}/user/client.key "${DEBUG}"
-
   # check if errexit mode is set and disabling as the component may not exist
   local save=$-
   if [[ $save =~ e ]]; then