debug

fstagni · Oct 5, 2023 · fa8a684 · fa8a684
1 parent b0cbfcb
commit fa8a684
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -163,7 +163,7 @@ jobs:
           sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
           sed -i "s/VAR_JENKINS_CE/jenkins-lhcb.cern.ch/g" pilot.json
           sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
-          sed -i "s/VAR_DIRAC_VERSION//g" pilot.json
+          sed -i "s/VAR_DIRAC_VERSION/v11.0.20/g" pilot.json
           sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
           sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
           sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json

diff --git a/Pilot/pilotCommands.py b/Pilot/pilotCommands.py
@@ -302,12 +302,17 @@ def _locateInstallationScript(self):
     def _getPreinstalledEnvScript(self):
         """ Get preinstalled environment script if any """
 
+        self.log.debug(f"self.pp.preinstalledEnv = {self.pp.preinstalledEnv}")
+        self.log.debug(f"self.pp.preinstalledEnvPrefix = {self.pp.preinstalledEnvPrefix}")
+
         preinstalledEnvScript = self.pp.preinstalledEnv
         if not preinstalledEnvScript and self.pp.preinstalledEnvPrefix:
             version = self.pp.releaseVersion or "pro"
             arch = platform.system() + "-" + platform.machine()
             preinstalledEnvScript = os.path.join(self.pp.preinstalledEnvPrefix, version, arch, "diracosrc")
 
+        self.log.debug(f"preinstalledEnvScript = {preinstalledEnvScript}")
+
         if preinstalledEnvScript:
             self.log.info("Evaluating env script %s" % preinstalledEnvScript)
             if not safe_listdir(os.path.dirname(preinstalledEnvScript)):