ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerRcondor.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerRcondor.py (file contents):
Revision 1.9 by belforte, Fri Aug 10 17:04:28 2012 UTC vs.
Revision 1.10 by belforte, Fri Aug 10 17:54:30 2012 UTC

# Line 7 | Line 7 | from crab_exceptions import CrabExceptio
7   from crab_util import runCommand
8   #from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
9   from WMCore.SiteScreening.BlackWhiteListParser import SEBlackWhiteListParser
10 + import Scram
11  
12  
13  
# Line 58 | Line 59 | class SchedulerRcondor(SchedulerGrid) :
59          self.role = cfg_params.get("GRID.role", None)
60          self.VO = cfg_params.get('GRID.virtual_organization','cms')
61          
61        self.cmsswVer  = os.environ["CMSSW_VERSION"]
62        self.scramArch = os.environ["SCRAM_ARCH"]
63
62          try:
63              tmp =  cfg_params['CMSSW.datasetpath']
64              if tmp.lower() == 'none':
# Line 105 | Line 103 | class SchedulerRcondor(SchedulerGrid) :
103  
104          jobParams += '+DESIRED_SEs = "'+seString+'"; '
105  
106 <        cmsVersion=self.cmsswVer
106 >        scram = Scram.Scram(None)
107 >        cmsVersion = scram.getSWVersion()
108 >        scramArch  = scram.getArch()
109 >        
110          cmsver=re.split('_', cmsVersion)
111          numericCmsVersion = "%s%.2d%.2d" %(cmsver[1], int(cmsver[2]), int(cmsver[3]))
112  
113          jobParams += '+DESIRED_CMSVersion ="' +cmsVersion+'";'
114          jobParams += '+DESIRED_CMSVersionNr ="' +numericCmsVersion+'";'
115 +        jobParams += '+DESIRED_CMSScramArch ="' +scramArch+'";'
116          
117          myschedName = self.rcondorHost
118          jobParams += '+Glidein_MonitorID = "https://'+ myschedName + '//$(Cluster).$(Process)"; '

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines