Skip to content

Commit

Permalink
Merge pull request #6160 from simon-mazenoux/fix-remove-VOPolicy-from…
Browse files Browse the repository at this point in the history
…-job-description

[Integration] fix: removing VOPolicy from job description
  • Loading branch information
fstagni authored Jun 14, 2022
2 parents d8ec058 + 2cf9b51 commit fb12c8b
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/DIRAC/WorkloadManagementSystem/DB/JobDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -1163,18 +1163,6 @@ def __checkAndPrepareJob(
if inputDataPolicy and not classAdJob.lookupAttribute("InputDataModule"):
classAdJob.insertAttributeString("InputDataModule", inputDataPolicy)

# ################## adding DIRAC/VOPolicy as classAds
# FIXME: to remove
setup = gConfig.getValue("/DIRAC/Setup", "")
voPolicyDict = gConfig.getOptionsDict("/DIRAC/VOPolicy/%s/%s" % (vo, setup))
# voPolicyDict = gConfig.getOptionsDict('/DIRAC/VOPolicy')
if voPolicyDict["OK"]:
voPolicy = voPolicyDict["Value"]
for param, val in voPolicy.items():
if not classAdJob.lookupAttribute(param):
classAdJob.insertAttributeString(param, val)
# ##################

# priority
priority = classAdJob.getAttributeInt("Priority")
if priority is None:
Expand Down

0 comments on commit fb12c8b

Please sign in to comment.