Skip to content

Commit

Permalink
Merge pull request #8083 from aldbr/v8.0_FIX_condor-v24
Browse files Browse the repository at this point in the history
[8.0] fix: condor and delegated proxies
  • Loading branch information
fstagni authored Mar 7, 2025
2 parents 3206156 + 1f22ee4 commit d10afe5
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ def __writeSub(self, executable, location, processors, pilotStamps, tokenFile=No

executable = os.path.join(self.workingDirectory, executable)

useCredentials = ""
# For now, we still need to include a proxy in the submit file
# HTCondor extracts VOMS attribute from it for the sites
useCredentials = "use_x509userproxy = true"
# If tokenFile is present, then we transfer it to the worker node
if tokenFile:
useCredentials += textwrap.dedent(
Expand Down Expand Up @@ -274,6 +276,10 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
htcEnv = {
"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "SCITOKENS",
"_CONDOR_SCITOKENS_FILE": self.tokenFile.name,
# This options is needed because we are still passing the proxy in the JDL (see use_x509userproxy)
# In condor v24.4, there is a bug preventing us from delegating the proxy, so we have to set
# it to false: https://opensciencegrid.atlassian.net/browse/HTCONDOR-2904
"_CONDOR_DELEGATE_JOB_GSI_CREDENTIALS": "false",
}
if cas := getCAsLocation():
htcEnv["_CONDOR_AUTH_SSL_CLIENT_CADIR"] = cas
Expand Down

0 comments on commit d10afe5

Please sign in to comment.