15 |
|
""" |
16 |
|
jobParams = SchedulerCondorCommon.sched_parameter(self,i,task) |
17 |
|
|
18 |
< |
seDest = self.blackWhiteListParser.cleanForBlackWhiteList(eval(task.jobs[i-1]['dlsDestination'])) |
19 |
< |
#ceDest = self.getCEfromSE(seDest) |
18 |
> |
ceDest = self.seListToCElist(task.jobs[i-1]['dlsDestination'], onlyOSG=False) |
19 |
> |
ceString = ','.join(ceDest) |
20 |
|
|
21 |
< |
# FIXME: Translate seDest into glidein name using SiteDB |
22 |
< |
|
23 |
< |
jobParams += '+DESIRED_Sites = "T2_US_UCSD"; ' |
21 |
> |
jobParams += '+DESIRED_Gatekeepers = "'+ceString+'"; ' |
22 |
|
jobParams += '+DESIRED_Archs = "INTEL,X86_64"; ' |
23 |
< |
jobParams += "Requirements = stringListMember(GLIDEIN_Site,DESIRED_Sites) && stringListMember(Arch,DESIRED_Archs); " |
23 |
> |
jobParams += "Requirements = stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers) && stringListMember(Arch,DESIRED_Archs); " |
24 |
> |
if (self.EDG_clock_time): |
25 |
> |
jobParams += '+MaxWallTimeMins = '+self.EDG_clock_time+'; ' |
26 |
|
|
27 |
|
common._db.updateTask_({'jobType':jobParams}) |
28 |
|
return jobParams # Not sure I even need to return anything |