[Swift-commit] r7184 - trunk/tests/sites/midway

[yadunandb at ci.uchicago.edu]

Author: yadunandb
Date: 2013-10-18 14:41:31 -0500 (Fri, 18 Oct 2013)
New Revision: 7184

Removed:
   trunk/tests/sites/midway/sanity.setup.sh
   trunk/tests/sites/midway/sanity.source.sh
   trunk/tests/sites/midway/sanity.swift
   trunk/tests/sites/midway/sanity.timeout
   trunk/tests/sites/midway/sites.new.xml
Modified:
   trunk/tests/sites/midway/sites.template.xml
Log:
Updated midway sites test

Deleted: trunk/tests/sites/midway/sanity.setup.sh
===================================================================
--- trunk/tests/sites/midway/sanity.setup.sh	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sanity.setup.sh	2013-10-18 19:41:31 UTC (rev 7184)
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-USERNAME=$MIDWAY_USERNAME
-
-if [[ -z $USERNAME ]] 
-then
-    echo "Remote username not provided. Skipping sites configs"
-else
-    ls *xml
-    cat sites.xml  | sed "s/{env.USER}/$USERNAME/" > tmp && mv tmp sites.xml
-fi

Deleted: trunk/tests/sites/midway/sanity.source.sh
===================================================================
--- trunk/tests/sites/midway/sanity.source.sh	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sanity.source.sh	2013-10-18 19:41:31 UTC (rev 7184)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ "$HOSTNAME" == "midway001" ]
-then
-   export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
-   export GLOBUS_TCP_PORT_RANGE=50000,51000
-fi;

Deleted: trunk/tests/sites/midway/sanity.swift
===================================================================
--- trunk/tests/sites/midway/sanity.swift	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sanity.swift	2013-10-18 19:41:31 UTC (rev 7184)
@@ -1,11 +0,0 @@
-type file;
-
-app (file out, file err) remote_driver ()
-{
-    date stdout=@filename(out) stderr=@filename(err);
-}
-
-file driver_out <simple_mapper; prefix="sanity", suffix=".out">;
-file driver_err <simple_mapper; prefix="sanity", suffix=".err">;
-
-(driver_out, driver_err) = remote_driver();
\ No newline at end of file

Deleted: trunk/tests/sites/midway/sanity.timeout
===================================================================
--- trunk/tests/sites/midway/sanity.timeout	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sanity.timeout	2013-10-18 19:41:31 UTC (rev 7184)
@@ -1 +0,0 @@
-300

Deleted: trunk/tests/sites/midway/sites.new.xml
===================================================================
--- trunk/tests/sites/midway/sites.new.xml	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sites.new.xml	2013-10-18 19:41:31 UTC (rev 7184)
@@ -1,20 +0,0 @@
-<config>
-  <pool handle="beagle">
-    <execution provider="coaster" jobmanager="ssh-cl:local" url="login4.beagle.ci.uchicago.edu"/>
-    <profile namespace="globus" key="jobsPerNode">24</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
-    <profile namespace="globus" key="maxtime">3600</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/yadunandb/swiftwork</profile>
-    <profile namespace="globus" key="slots">20</profile>
-    <profile namespace="globus" key="maxnodes">1</profile>
-    <profile namespace="globus" key="nodeGranularity">1</profile>
-    <profile namespace="karajan" key="jobThrottle">4.80</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <profile namespace="karajan" key="workerLoggingLevel">trace</profile>
-    <!-- <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory> -->
-    <workdirectory>/tmp/yadunandb/swiftwork</workdirectory>
-  </pool>
-</config>
\ No newline at end of file

Modified: trunk/tests/sites/midway/sites.template.xml
===================================================================
--- trunk/tests/sites/midway/sites.template.xml	2013-10-18 19:32:13 UTC (rev 7183)
+++ trunk/tests/sites/midway/sites.template.xml	2013-10-18 19:41:31 UTC (rev 7184)
@@ -2,14 +2,14 @@
 <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
 
   <pool handle="midway">
-    <execution provider="coaster" jobmanager="local:slurm"/>
+    <execution provider="coaster" jobmanager="ssh-cl:slurm" url="swift.rcc.uchicago.edu"/>
     <profile namespace="globus" key="queue">sandyb</profile>
     <profile namespace="globus" key="jobsPerNode">16</profile>
     <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="maxTime">3600</profile>
+    <profile namespace="globus" key="maxTime">500</profile>
     <profile namespace="globus" key="highOverAllocation">100</profile>
     <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="slots">2</profile>
+    <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxNodes">1</profile>
     <profile namespace="globus" key="nodeGranularity">1</profile>
     <profile namespace="karajan" key="jobThrottle">.64</profile>