[Swift-commit] r7907 - branches/release-0.95/tests/sites/uc3

[yadunandb at ci.uchicago.edu]

Author: yadunandb
Date: 2014-06-09 14:52:22 -0500 (Mon, 09 Jun 2014)
New Revision: 7907

Removed:
   branches/release-0.95/tests/sites/uc3/sanity.setup.sh
   branches/release-0.95/tests/sites/uc3/sanity.source.sh
   branches/release-0.95/tests/sites/uc3/sanity.swift
   branches/release-0.95/tests/sites/uc3/sanity.timeout
Modified:
   branches/release-0.95/tests/sites/uc3/sites.template.xml
Log:

UC3 sanity tests, fixed.



Deleted: branches/release-0.95/tests/sites/uc3/sanity.setup.sh
===================================================================
--- branches/release-0.95/tests/sites/uc3/sanity.setup.sh	2014-06-09 17:03:04 UTC (rev 7906)
+++ branches/release-0.95/tests/sites/uc3/sanity.setup.sh	2014-06-09 19:52:22 UTC (rev 7907)
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-USERNAME=$UC3_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: branches/release-0.95/tests/sites/uc3/sanity.source.sh
===================================================================
--- branches/release-0.95/tests/sites/uc3/sanity.source.sh	2014-06-09 17:03:04 UTC (rev 7906)
+++ branches/release-0.95/tests/sites/uc3/sanity.source.sh	2014-06-09 19:52:22 UTC (rev 7907)
@@ -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: branches/release-0.95/tests/sites/uc3/sanity.swift
===================================================================
--- branches/release-0.95/tests/sites/uc3/sanity.swift	2014-06-09 17:03:04 UTC (rev 7906)
+++ branches/release-0.95/tests/sites/uc3/sanity.swift	2014-06-09 19:52:22 UTC (rev 7907)
@@ -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: branches/release-0.95/tests/sites/uc3/sanity.timeout
===================================================================
--- branches/release-0.95/tests/sites/uc3/sanity.timeout	2014-06-09 17:03:04 UTC (rev 7906)
+++ branches/release-0.95/tests/sites/uc3/sanity.timeout	2014-06-09 19:52:22 UTC (rev 7907)
@@ -1 +0,0 @@
-300

Modified: branches/release-0.95/tests/sites/uc3/sites.template.xml
===================================================================
--- branches/release-0.95/tests/sites/uc3/sites.template.xml	2014-06-09 17:03:04 UTC (rev 7906)
+++ branches/release-0.95/tests/sites/uc3/sites.template.xml	2014-06-09 19:52:22 UTC (rev 7907)
@@ -2,18 +2,20 @@
 <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
 
   <pool handle="uc3">
-    <execution provider="coaster" url="login01.osgconnect.net" jobmanager="ssh-cl:condor"/>
+    <execution provider="coaster" url="login.osgconnect.net" jobmanager="ssh-cl:condor"/>
     <profile namespace="karajan" key="jobThrottle">10.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <profile namespace="globus"  key="jobsPerNode">1</profile>
-    <profile namespace="globus"  key="maxtime">3600</profile>
-    <profile namespace="globus"  key="maxWalltime">00:30:00</profile>
+    <profile namespace="globus"  key="maxtime">1200</profile>
+    <profile namespace="globus"  key="maxWalltime">00:10:00</profile>
     <profile namespace="globus"  key="highOverAllocation">100</profile>
     <profile namespace="globus"  key="lowOverAllocation">100</profile>
     <profile namespace="globus"  key="slots">1</profile>
     <profile namespace="globus"  key="maxNodes">1</profile>
     <profile namespace="globus"  key="nodeGranularity">1</profile>
     <profile namespace="globus"  key="condor.+ProjectName">"Swift"</profile>
+    <profile namespace="globus" key="userHomeOverride">/tmp/swiftwork</profile>
+    <profile namespace="globus" key="jobType">nonshared</profile>
     <workdirectory>/tmp/swiftwork</workdirectory>
   </pool>
 </config>