[Swift-commit] r4432 - tags/release-0.92.1/tests

[skenny at ci.uchicago.edu]

Author: skenny
Date: 2011-04-27 13:12:25 -0500 (Wed, 27 Apr 2011)
New Revision: 4432

Modified:
   tags/release-0.92.1/tests/sitetester
Log:
successfully runs site tests on ranger and beagle

Modified: tags/release-0.92.1/tests/sitetester
===================================================================
--- tags/release-0.92.1/tests/sitetester	2011-04-27 18:03:08 UTC (rev 4431)
+++ tags/release-0.92.1/tests/sitetester	2011-04-27 18:12:25 UTC (rev 4432)
@@ -10,19 +10,20 @@
 
 class Site:
 
-    def __init__(self,login,logtype,workdir,queue,project):
+    def __init__(self,login,logtype,workdir,queue,project,test):
         self.login = login
         self.logintype = logtype
         self.workdir = workdir
         self.queue = queue
         self.project = project
+        self.test = test
 
-    def testSite(self,cogv,swiftv,test_type):
-            cmdline = self.logintype+" "+self.login+" "+self.workdir+"/run-nightly.sh "+self.workdir+"/"+test_type+" "+self.workdir+" "+self.queue+" "+self.project+" "+cogv+" "+swiftv
+    def testSite(self,cogv,swiftv):
+            cmdline = self.logintype+" "+self.login+" "+self.workdir+"/run-suite.sh "+self.workdir+"/"+self.test+" "+self.workdir+" "+self.queue+" "+self.project+" "+cogv+" "+swiftv
             print "running......"+cmdline
             res = commands.getoutput(cmdline)
             print res
-            cmdline2 =  "scp -r "+s+":"+rundir+" ."
+            cmdline2 =  "scp -r "+self.login+":"+rundir+" ."
             res2 = commands.getoutput(cmdline)
     
 
@@ -32,28 +33,30 @@
 
 sites = []
 
-s_logins = ['skenny at login2.pads.ci.uchicago.edu','login-abe.ncsa.teragrid.org','login1-qb.loni-lsu.teragrid.org']
-logintype = ['ssh','gsissh','gsissh']
-workdirs = ['/home/skenny/swift_runs/tests','/u/ac/skenny/swift_runs/tests','/home/skenny/swift_runs/tests']
-queues = ['short','debug','workq']
-projects = ['CI-IBN000039','TG-DBS080004N','TG-DBS080004N']
+s_logins = ['login.beagle.ci.uchicago.edu','tg457040 at tg-login.ranger.tacc.teragrid.org']
+logintype = ['ssh','ssh','ssh']
+#workdirs = ['/home/skenny/swift_runs/beagle/cog/modules/swift/tests']
+workdirs = ['/home/skenny/cog/modules/swift/tests','/work/00043/tg457040/cog/modules/swift/tests']
+queues = ['batch','development']
+projects = ['CI-IBN000039','TG-DBS080004N']
 
-test_type = "groups/local-pbs-coasters.sh"
-cogv = 'branches/4.1.8'
-swiftv = 'branches/release-0.92'
+test_type = ['groups/crayxt-pbs-coasters.sh','groups/local-sge-coasters.sh']
+cogv = 'tags/swift_0.92.1'
+swiftv = 'tags/release-0.92.1'
 
 rundir = commands.getoutput('date +\"%Y-%m-%d\"')
 rundir = "run-"+rundir
 
 for idx,s in enumerate(s_logins):
-    sites.append(Site(s,logintype[idx],workdirs[idx],queues[idx],projects[idx]))
+    sites.append(Site(s,logintype[idx],workdirs[idx],queues[idx],projects[idx],test_type[idx]))
 
 # loop over all or run single
 
-sites[1].testSite(cogv,swiftv,test_type)
-sites[2].testSite(cogv,swiftv,test_type)    
+for s in sites:
+    s.testSite(cogv,swiftv)
 
 
 
 
 
+