[Swift-commit] r6514 - in SwiftTutorials/OSG_2013-03-11/MODIS: . test.uc3

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-05-22 16:49:01 -0500 (Wed, 22 May 2013)
New Revision: 6514

Removed:
   SwiftTutorials/OSG_2013-03-11/MODIS/swift.log
Modified:
   SwiftTutorials/OSG_2013-03-11/MODIS/setup.sh
   SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/getlanduse.pl
   SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/uc3.xml
Log:
Adjusted tests for local execution on UC3

Modified: SwiftTutorials/OSG_2013-03-11/MODIS/setup.sh
===================================================================
--- SwiftTutorials/OSG_2013-03-11/MODIS/setup.sh	2013-05-20 15:17:13 UTC (rev 6513)
+++ SwiftTutorials/OSG_2013-03-11/MODIS/setup.sh	2013-05-22 21:49:01 UTC (rev 6514)
@@ -2,14 +2,27 @@
 
 export SWIFT_HEAP_MAX=4G
 
-SWIFTREL=/home/wilde/swift/src/0.94/cog/modules/swift/dist/rc5.1/bin
+# SWIFTREL=/home/wilde/swift/src/0.94/cog/modules/swift/dist/rc5.1/bin
 
 if echo $PATH | sed -e 's/:/\n/g' | grep $PWD >/dev/null; then
   echo PATH is already set, not resetting
 else
-   PATH=$PWD/bin:.:$SWIFTREL:$PATH
+   PATH=$PWD/bin:.:$PATH
 fi
 
+if which swift >& /dev/null; then
+  echo "Using swift from PATH"
+else
+  echo "Trying to load swift module:"
+  module load swift
+  if which swift >& /dev/null; then
+    Swift loaded from module
+  else
+    echo "Cant find a swift to run"
+    return
+  fi
+fi
+
 echo -e "\\nUsing swift release from: \\c"
 which swift
 swift -version

Deleted: SwiftTutorials/OSG_2013-03-11/MODIS/swift.log
===================================================================
--- SwiftTutorials/OSG_2013-03-11/MODIS/swift.log	2013-05-20 15:17:13 UTC (rev 6513)
+++ SwiftTutorials/OSG_2013-03-11/MODIS/swift.log	2013-05-22 21:49:01 UTC (rev 6514)
@@ -1 +0,0 @@
-2013-03-13 21:41:13,241+0000 DEBUG Loader Swift started

Modified: SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/getlanduse.pl
===================================================================
--- SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/getlanduse.pl	2013-05-20 15:17:13 UTC (rev 6513)
+++ SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/getlanduse.pl	2013-05-22 21:49:01 UTC (rev 6514)
@@ -26,4 +26,4 @@
 
 system("hostname -f 2>&1");
 
-sleep(30);
+sleep(5);

Modified: SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/uc3.xml
===================================================================
--- SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/uc3.xml	2013-05-20 15:17:13 UTC (rev 6513)
+++ SwiftTutorials/OSG_2013-03-11/MODIS/test.uc3/uc3.xml	2013-05-22 21:49:01 UTC (rev 6514)
@@ -1,6 +1,6 @@
 <config>
   <pool handle="uc3">
-    <execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
+    <execution provider="coaster" jobmanager="local:condor"/>
     <profile namespace="karajan" key="jobThrottle">10.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <profile namespace="globus"  key="jobsPerNode">1</profile>