Merge pull request #7995 from DIRACGridBot/cherry-pick-2-ad5315508-in…

…tegration

[sweep:integration] fix: adapt HTCondorCE to latest htcondor version

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

@@ -170,7 +170,7 @@ def __writeSub(self, executable, location, processors, pilotStamps, tokenFile=No
 
         executable = os.path.join(self.workingDirectory, executable)
 
-        useCredentials = "use_x509userproxy = true"
+        useCredentials = ""
         # If tokenFile is present, then we transfer it to the worker node
         if tokenFile:
             useCredentials += textwrap.dedent(
@@ -242,10 +242,7 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
         if not result["OK"]:
             return result
 
-        htcEnv = {
-            "_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "GSI",
-        }
-
+        htcEnv = {}
         if self.useSSLSubmission:
             # this is guaranteed by _prepareProxy above
             proxyFile = os.environ.get("X509_USER_PROXY")