[Swift-commit] r7333 - in trunk/tests: groups sites/raven

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-25 11:23:06 -0600 (Mon, 25 Nov 2013)
New Revision: 7333

Removed:
   trunk/tests/sites/raven/sanity.setup.sh
   trunk/tests/sites/raven/sanity.source.sh
   trunk/tests/sites/raven/sanity.swift
   trunk/tests/sites/raven/sanity.timeout
Modified:
   trunk/tests/groups/group-remote-sanity.sh
   trunk/tests/sites/raven/raven_sanity.setup.sh
   trunk/tests/sites/raven/sites.template.xml
Log:
Updates to raven remote sanity test


Modified: trunk/tests/groups/group-remote-sanity.sh
===================================================================
--- trunk/tests/groups/group-remote-sanity.sh	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/groups/group-remote-sanity.sh	2013-11-25 17:23:06 UTC (rev 7333)
@@ -5,11 +5,11 @@
             $TESTDIR/sites/mcs    \
             $TESTDIR/sites/midway \
             $TESTDIR/sites/uc3    \
-	        # Frisbee will fail due to Bug 1030
             $TESTDIR/sites/mac-frisbee  \
             $TESTDIR/sites/blues  \
             $TESTDIR/sites/fusion \
-            $TESTDIR/sites/raven  \
+            # Raven will fail due to firewall restrictions, need to set up a reverse tunnel
+            # $TESTDIR/sites/raven  \
             $TESTDIR/sites/communicado \
             $TESTDIR/sites/bridled \
           )

Modified: trunk/tests/sites/raven/raven_sanity.setup.sh
===================================================================
--- trunk/tests/sites/raven/raven_sanity.setup.sh	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/raven_sanity.setup.sh	2013-11-25 17:23:06 UTC (rev 7333)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-USERNAME=$BLUES_USERNAME
+USERNAME=$RAVEN_USERNAME
 
 if [[ -z $USERNAME ]] 
 then

Deleted: trunk/tests/sites/raven/sanity.setup.sh
===================================================================
--- trunk/tests/sites/raven/sanity.setup.sh	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/sanity.setup.sh	2013-11-25 17:23:06 UTC (rev 7333)
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-USERNAME=$BLUES_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/raven/sanity.source.sh
===================================================================
--- trunk/tests/sites/raven/sanity.source.sh	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/sanity.source.sh	2013-11-25 17:23:06 UTC (rev 7333)
@@ -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/raven/sanity.swift
===================================================================
--- trunk/tests/sites/raven/sanity.swift	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/sanity.swift	2013-11-25 17:23:06 UTC (rev 7333)
@@ -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/raven/sanity.timeout
===================================================================
--- trunk/tests/sites/raven/sanity.timeout	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/sanity.timeout	2013-11-25 17:23:06 UTC (rev 7333)
@@ -1 +0,0 @@
-300

Modified: trunk/tests/sites/raven/sites.template.xml
===================================================================
--- trunk/tests/sites/raven/sites.template.xml	2013-11-25 17:12:24 UTC (rev 7332)
+++ trunk/tests/sites/raven/sites.template.xml	2013-11-25 17:23:06 UTC (rev 7333)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
   <pool handle="raven">
-    <execution provider="coaster" jobmanager="local:pbs"/>
+    <execution provider="coaster" jobmanager="ssh-cl:pbs" url="raven.cray.com"/>
     <profile namespace="globus" key="project">CI-SES000031</profile>
     <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
     <profile namespace="globus" key="jobsPerNode">24</profile>
     <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
     <profile namespace="globus" key="maxWallTime">00:01:00</profile>
     <profile namespace="globus" key="slots">1</profile>
-    <profile namespace="globus" key="nodeGranularity">2</profile>
-    <profile namespace="globus" key="maxNodes">2</profile>
+    <profile namespace="globus" key="nodeGranularity">1</profile>
+    <profile namespace="globus" key="maxNodes">1</profile>
     <profile namespace="karajan" key="jobThrottle">1.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>
-    <workdirectory>/home/users/p01537/swiftwork</workdirectory>
+    <workdirectory>/home/users/{env.USER}/swiftwork</workdirectory>
   </pool>
 </config>