[Swift-commit] r7293 - in trunk: etc tests

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-15 14:33:29 -0600 (Fri, 15 Nov 2013)
New Revision: 7293

Removed:
   trunk/tests/meta.sh
   trunk/tests/sitetester
Modified:
   trunk/etc/sites.xml
Log:
Add new xml info lines to default sites.xml
Remove old python site tester prototype


Modified: trunk/etc/sites.xml
===================================================================
--- trunk/etc/sites.xml	2013-11-15 20:06:42 UTC (rev 7292)
+++ trunk/etc/sites.xml	2013-11-15 20:33:29 UTC (rev 7293)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
 
 <!-- sites.xml specifies details of the sites that Swift can run on.
 

Deleted: trunk/tests/meta.sh
===================================================================
--- trunk/tests/meta.sh	2013-11-15 20:06:42 UTC (rev 7292)
+++ trunk/tests/meta.sh	2013-11-15 20:33:29 UTC (rev 7293)
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# runs run-suite.sh (wrapper for suite.sh) on a given site based on login
-
-SITE_LOGIN=$1 # e.g. login.pads.ci.uchicago.edu
-
-DIR=$2 # e.g., /home/skenny/swift_runs/tests
-
-TEST=$3 # e.g. sites/pads-pbs-coasters.sh
-
-# run test and retrieve results
-
-RUNDIR=run-$( date +"%Y-%m-%d" )
-
-ssh $SITE_LOGIN $DIR/run-suite.sh $DIR/$TEST
-scp -r $SITE_LOGIN:$RUNDIR .
-
-exit 0

Deleted: trunk/tests/sitetester
===================================================================
--- trunk/tests/sitetester	2013-11-15 20:06:42 UTC (rev 7292)
+++ trunk/tests/sitetester	2013-11-15 20:33:29 UTC (rev 7293)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-
-import commands
-import os
-
-# the workdir for a given site needs to exist on the site you're testing
-# and should contain run-suite & suite.sh
-# this script will ssh onto the site, pass run-suite the necesary variables
-# for running suite.sh
-
-class Site:
-
-    def __init__(self,login,logtype,workdir,queue,project):
-        self.login = login
-        self.logintype = logtype
-        self.workdir = workdir
-        self.queue = queue
-        self.project = project
-
-    def testSite(self,cogv,swiftv,test_type):
-            cmdline = self.logintype+" "+self.login+" "+self.workdir+"/run-suite.sh "+self.workdir+"/"+test_type+" "+self.workdir+" "+self.queue+" "+self.project+" "+cogv+" "+swiftv
-            print "running......"+cmdline
-            res = commands.getoutput(cmdline)
-            print res
-            cmdline2 =  "scp -r "+s+":"+rundir+" ."
-            res2 = commands.getoutput(cmdline)
-
-
-
-
-#---------------------main--------------------------------------------------------
-
-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']
-
-test_type = "groups/local-pbs-coasters.sh"
-cogv = 'branches/4.1.8'
-swiftv = 'branches/release-0.92'
-
-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]))
-
-# loop over all or run single
-
-sites[1].testSite(cogv,swiftv,test_type)
-sites[2].testSite(cogv,swiftv,test_type)
-
-
-
-
-