[Swift-commit] r7332 - in trunk/tests/sites: blues mac-frisbee

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-25 11:12:24 -0600 (Mon, 25 Nov 2013)
New Revision: 7332

Removed:
   trunk/tests/sites/blues/sanity.setup.sh
   trunk/tests/sites/blues/sanity.source.sh
   trunk/tests/sites/blues/sanity.swift
   trunk/tests/sites/blues/sanity.timeout
   trunk/tests/sites/mac-frisbee/sanity.setup.sh
   trunk/tests/sites/mac-frisbee/sanity.source.sh
   trunk/tests/sites/mac-frisbee/sanity.swift
   trunk/tests/sites/mac-frisbee/sanity.timeout
Modified:
   trunk/tests/sites/blues/sites.template.xml
Log:
Remove duplicate scripts
Fix setup for blues


Deleted: trunk/tests/sites/blues/sanity.setup.sh
===================================================================
--- trunk/tests/sites/blues/sanity.setup.sh	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/blues/sanity.setup.sh	2013-11-25 17:12:24 UTC (rev 7332)
@@ -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/blues/sanity.source.sh
===================================================================
--- trunk/tests/sites/blues/sanity.source.sh	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/blues/sanity.source.sh	2013-11-25 17:12:24 UTC (rev 7332)
@@ -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/blues/sanity.swift
===================================================================
--- trunk/tests/sites/blues/sanity.swift	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/blues/sanity.swift	2013-11-25 17:12:24 UTC (rev 7332)
@@ -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/blues/sanity.timeout
===================================================================
--- trunk/tests/sites/blues/sanity.timeout	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/blues/sanity.timeout	2013-11-25 17:12:24 UTC (rev 7332)
@@ -1 +0,0 @@
-300

Modified: trunk/tests/sites/blues/sites.template.xml
===================================================================
--- trunk/tests/sites/blues/sites.template.xml	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/blues/sites.template.xml	2013-11-25 17:12:24 UTC (rev 7332)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
     <pool handle="blues">
-        <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+        <execution jobmanager="ssh-cl:pbs" provider="coaster" url="blues.lcrc.anl.gov"/>
         <filesystem provider="local" url="none" />
         <profile namespace="globus" key="maxtime">3600</profile>
         <profile namespace="globus" key="jobsPerNode">2</profile>
@@ -12,8 +12,6 @@
         <profile namespace="globus" key="maxNodes">2</profile>
         <profile namespace="karajan" key="jobThrottle">1.00</profile>
         <profile namespace="karajan" key="initialScore">10000</profile>
-        <profile namespace="globus" key="HighOverAllocation">1000</profile>
-        <profile namespace="globus" key="LowOverAllocation">1000</profile>
-        <workdirectory>{env.HOME}/swiftwork</workdirectory>
+        <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
     </pool>
 </config>

Deleted: trunk/tests/sites/mac-frisbee/sanity.setup.sh
===================================================================
--- trunk/tests/sites/mac-frisbee/sanity.setup.sh	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/mac-frisbee/sanity.setup.sh	2013-11-25 17:12:24 UTC (rev 7332)
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-USERNAME=$MCS_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/mac-frisbee/sanity.source.sh
===================================================================
--- trunk/tests/sites/mac-frisbee/sanity.source.sh	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/mac-frisbee/sanity.source.sh	2013-11-25 17:12:24 UTC (rev 7332)
@@ -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/mac-frisbee/sanity.swift
===================================================================
--- trunk/tests/sites/mac-frisbee/sanity.swift	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/mac-frisbee/sanity.swift	2013-11-25 17:12:24 UTC (rev 7332)
@@ -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/mac-frisbee/sanity.timeout
===================================================================
--- trunk/tests/sites/mac-frisbee/sanity.timeout	2013-11-25 16:55:54 UTC (rev 7331)
+++ trunk/tests/sites/mac-frisbee/sanity.timeout	2013-11-25 17:12:24 UTC (rev 7332)
@@ -1 +0,0 @@
-300