fix: slightly better naming for the tests

Author: fstagni

.github/workflows/integration.yml

@@ -3,15 +3,14 @@ name: integration
 on: [push]
 
 jobs:
-  integration-local_install:
+  local_install:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         dirac_branch:
           - rel-v8r0
           - integration
-          
         pilot_schema:
           - pilot_oldSchema.json
           - pilot_newSchema.json
@@ -51,10 +50,10 @@ jobs:
           g_job="testintegrationworkflow${GITHUB_JOB//-/}"
           pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
           pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
-          python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript="dirac-apptainer-exec dirac-platform" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug
-
+          python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug
+          
 
-  integration-cvmfs:
+  release_prod_pre-cvmfs:
     runs-on: ubuntu-latest
 
     strategy:
@@ -111,7 +110,7 @@ jobs:
           python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript=dirac-platform --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
 
 
-  integration-cvmfs_no_env_CEs:
+  release_prod-cvmfs_no_env_CEs:
     runs-on: ubuntu-latest
 
     strategy:
@@ -156,7 +155,7 @@ jobs:
           g_job="testintegrationworkflow${GITHUB_JOB//-/}"
           pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
           pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
-          python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac  --architectureScript="dirac-apptainer-exec dirac-platform" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=dteam -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
+          python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=dteam -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
 
 
   matching:
@@ -203,7 +202,7 @@ jobs:
           python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::integration -M 1 -S DIRAC-Certification -N jenkins-full.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
 
 
-  integration-cvmfs_matching:
+  release_prod_pre-cvmfs_matching:
     runs-on: ubuntu-latest
 
     strategy:
@@ -256,7 +255,7 @@ jobs:
           python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-full.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=${{ matrix.VO }} -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
 
 
-  integration-cvmfs_matching_CEs:
+  release_prod-cvmfs_matching_CEs:
     runs-on: ubuntu-latest
 
     strategy:
@@ -459,4 +458,4 @@ jobs:
           g_job="testintegrationworkflow${GITHUB_JOB//-/}"
           pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
           pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
-          python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --preinstalledEnvPrefix=/cvmfs/lhcb.cern.ch/lhcbdirac/ --architectureScript="dirac-apptainer-exec dirac-architecture" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
+          python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --preinstalledEnvPrefix=/cvmfs/lhcb.cern.ch/lhcbdirac/ --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug

Pilot/pilotCommands.py

@@ -824,14 +824,16 @@ def execute(self):
         cfg = []
         if self.pp.useServerCertificate:
             cfg.append("-o  /DIRAC/Security/UseServerCertificate=yes")
+        if self.pp.localConfigFile:
+            cfg.extend(["--cfg", self.pp.localConfigFile])  # this file is as input
 
         archScript = self.pp.architectureScript
-        if self.pp.architectureScript.split(" ")[0] == 'dirac-apptainer-exec':
+        if self.pp.architectureScript.split(" ")[0] == "dirac-apptainer-exec":
             archScript = self.pp.architectureScript.split(" ")[1]
 
-        architectureCmd = "%s %s -d" % (archScript, " ".join(cfg))
+        architectureCmd = "%s %s -ddd" % (archScript, " ".join(cfg))
 
-        if self.pp.architectureScript.split(" ")[0] == 'dirac-apptainer-exec':
+        if self.pp.architectureScript.startswith("dirac-apptainer-exec"):
             architectureCmd = "dirac-apptainer-exec '%s' %s" % (architectureCmd, " ".join(cfg))
 
         retCode, localArchitecture = self.executeAndGetOutput(architectureCmd, self.pp.installEnv)

Pilot/pilotTools.py

@@ -1030,7 +1030,7 @@ def __checkSecurityDir(self, envName, dirName):
                 self.installEnv[envName] = candidateDir
                 os.environ[envName] = candidateDir
                 return
-            self.log.debug("%s not found or not a directory" % candidateDir)
+            self.log.debug("%s empty, or not found, or not a directory" % candidateDir)
 
         if envName in os.environ and safe_listdir(os.environ[envName]):
             self.log.debug(