Merge pull request #8087 from fstagni/90_integration_tests_fixes

[9.0] fix: the configuration and proxy init should be done by the client only

Author: fstagni

.github/workflows/integration.yml

@@ -36,7 +36,7 @@ jobs:
           - TEST_NAME: "Force DEncode and MySQL8"
             ARGS: DIRAC_USE_JSON_ENCODE=NO MYSQL_VER=mysql:8.0.40
           - TEST_NAME: "Backward Compatibility"
-            ARGS: CLIENT_INSTALLATION_BRANCH=rel-v8r0
+            ARGS: CLIENT_INSTALLATION_BRANCH=rel-v8r0 PILOT_INSTALLATION_BRANCH=rel-v8r0
 
     steps:
     - uses: actions/checkout@v4

tests/CI/install_client.sh

@@ -64,6 +64,10 @@ echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"
 installDIRAC
 
 if [[ -z "${INSTALLATION_BRANCH}" ]]; then
+    echo 'Generate a pilot proxy, to be used by the pilot'
+    dirac-proxy-init -g pilot -C /ca/certs/pilot.pem -K /ca/certs/pilot.key "${DEBUG}"
+    mv /tmp/x509up_u$UID /ca/certs/pilot_proxy
+
     echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
     dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt
 

tests/CI/run_pilot.sh

@@ -8,8 +8,15 @@ set -eo pipefail
 # IFS=$'\n\t'
 set -x
 
+echo "Starting run_pilot.sh"
 source CONFIG
 
+if [[ -n "${INSTALLATION_BRANCH}" ]]; then
+  # Do not run this
+  echo "Not running the DIRAC Pilot"
+  exit
+fi
+
 # Creating "the worker node"
 mkdir -p /home/dirac/etc/grid-security/certificates
 mkdir -p /home/dirac/etc/grid-security/vomsdir

tests/CI/run_tests.sh

@@ -50,7 +50,8 @@ elif [[ "$INSTALLTYPE" == "client" ]]; then
         source "${repo_path}/tests/Integration/all_integration_client_tests.sh"
     done
 
-elif [[ "$INSTALLTYPE" == "pilot" ]]; then
+# if "$INSTALLTYPE" == "pilot" and if INSTALLATION_BRANCH is not set
+elif [[ "$INSTALLTYPE" == "pilot" ]] && [[ -z "${INSTALLATION_BRANCH}" ]]; then
     # shellcheck source=/dev/null
     source /home/dirac/bashrc
     # If not unset, assert will not trigger

tests/Jenkins/dirac-cfg-setup-diracx.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import argparse
-import os
 
 from diraccfg import CFG
 

tests/Jenkins/dirac-cfg-update-server.py

@@ -10,21 +10,19 @@
 
 Script.parseCommandLine()
 
-setupName = "dirac-JenkinsSetup"
-
 # Where to store outputs
-if not os.path.isdir(f"{setupName}/sandboxes"):
-    os.makedirs(f"{setupName}/sandboxes")
+if not os.path.isdir("sandboxes"):
+    os.makedirs("sandboxes")
 
 # now updating the CS
 
 from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
 
 csAPI = CSAPI()
 
-csAPI.setOption("Systems/WorkloadManagement/Services/SandboxStore/BasePath", f"{setupName}/sandboxes")
+csAPI.setOption("Systems/WorkloadManagement/Services/SandboxStore/BasePath", "sandboxes")
 csAPI.setOption("Systems/WorkloadManagement/Services/SandboxStore/LogLevel", "DEBUG")
-csAPI.setOption("Systems/WorkloadManagement/Services/TornadoSandboxStore/BasePath", f"{setupName}/sandboxes")
+csAPI.setOption("Systems/WorkloadManagement/Services/TornadoSandboxStore/BasePath", "sandboxes")
 csAPI.setOption("Systems/WorkloadManagement/Services/TornadoSandboxStore/LogLevel", "DEBUG")
 
 # Now setting a SandboxSE as the following:
@@ -63,7 +61,7 @@
 csAPI.setOption("Resources/StorageElements/ProductionSandboxSE/DIP/ProtocolName", "DIP")
 csAPI.setOption("Resources/StorageElements/ProductionSandboxSE/DIP/Protocol", "dips")
 csAPI.setOption("Resources/StorageElements/ProductionSandboxSE/DIP/Access", "remote")
-csAPI.setOption("Resources/StorageElements/ProductionSandboxSE/DIP/Path", f"{setupName}/sandboxes")
+csAPI.setOption("Resources/StorageElements/ProductionSandboxSE/DIP/Path", "sandboxes")
 
 # Now setting a FileCatalogs section as the following:
 #     FileCatalogs

tests/Jenkins/dirac_ci.sh

@@ -396,10 +396,6 @@ fullInstallDIRAC() {
 
   echo "==> Restarting Configuration Server"
   dirac-restart-component Configuration Server -o /DIRAC/Security/UseServerCertificate=True ${DEBUG}
-
-  echo 'Generate a pilot proxy, to be used by the pilot'
-  dirac-proxy-init -g pilot -C /ca/certs/pilot.pem -K /ca/certs/pilot.key ${DEBUG}
-  mv /tmp/x509up_u$UID /ca/certs/pilot_proxy
 }
 
 

tests/Jenkins/utilities.sh

@@ -261,14 +261,21 @@ installDIRAC() {
   echo "$DIRAC"
   echo "$PATH"
 
-  # now configuring
+  echo "==> Done installing, now configuring"
+
   if ! dirac-proxy-init --nocs --no-upload; then
     echo 'ERROR: dirac-proxy-init failed' >&2
     exit 1
   fi
+
+  configureArgs=()
+  if [[ "${TEST_DIRACX:-}" = "Yes" ]]; then
+    configureArgs+=("--LegacyExchangeApiKey=diracx:legacy:InsecureChangeMe")
+  fi
+
   if [[ -n "${INSTALLATION_BRANCH}" ]]; then
     # Use this for (e.g.) running backward-compatibility tests
-    cmd="dirac-configure -S ${DIRACSETUP} -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}"
+    cmd="dirac-configure -S ${DIRACSETUP} -C ${CSURL} --SkipCAChecks "${configureArgs[@]}" ${CONFIGUREOPTIONS} ${DEBUG}"
   else
     cmd="dirac-configure -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}"
   fi