[Swift-commit] r7032 - in branches/release-0.94/tests: . sites/blues sites/fusion

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-09-04 12:55:20 -0500 (Wed, 04 Sep 2013)
New Revision: 7032

Modified:
   branches/release-0.94/tests/sites/blues/sites.template.xml
   branches/release-0.94/tests/sites/fusion/sites.template.xml
   branches/release-0.94/tests/suite.sh
Log:
Some updates to templates for blues and fusion, and ignore ifconfig warnings when setting globus hostname in suite.sh


Modified: branches/release-0.94/tests/sites/blues/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/blues/sites.template.xml	2013-09-04 16:27:20 UTC (rev 7031)
+++ branches/release-0.94/tests/sites/blues/sites.template.xml	2013-09-04 17:55:20 UTC (rev 7032)
@@ -2,7 +2,7 @@
     <pool handle="blues">
         <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="maxWallTime">00:00:30</profile>
         <profile namespace="globus" key="jobsPerNode">2</profile>
         <profile namespace="globus" key="ppn">8</profile>
         <profile namespace="globus" key="queue">route</profile>
@@ -11,8 +11,6 @@
         <profile namespace="globus" key="maxNodes">2</profile>
         <profile namespace="karajan" key="jobThrottle">2.20</profile>
         <profile namespace="karajan" key="initialScore">10000</profile>
-        <profile namespace="globus" key="HighOverAllocation">1000</profile>
-        <profile namespace="globus" key="LowOverAllocation">1000</profile>
         <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
     </pool>
 </config>

Modified: branches/release-0.94/tests/sites/fusion/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/fusion/sites.template.xml	2013-09-04 16:27:20 UTC (rev 7031)
+++ branches/release-0.94/tests/sites/fusion/sites.template.xml	2013-09-04 17:55:20 UTC (rev 7032)
@@ -1,8 +1,8 @@
 <config>
    <pool handle="fusion">
-      <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+      <execution jobmanager="ssh-cl:pbs" provider="coaster" url="fusion.lcrc.anl.gov"/>
       <filesystem provider="local" url="none" />
-      <profile namespace="globus" key="maxtime">3600</profile>
+      <profile namespace="globus" key="maxWallTime">00:00:30</profile>
       <profile namespace="globus" key="jobsPerNode">2</profile>
       <profile namespace="globus" key="slots">1</profile>
       <profile namespace="globus" key="nodeGranularity">2</profile>
@@ -10,9 +10,7 @@
       <profile namespace="globus" key="queue">shared</profile>
       <profile namespace="karajan" key="jobThrottle">5.99</profile>
       <profile namespace="karajan" key="initialScore">10000</profile>
-      <profile namespace="globus" key="HighOverAllocation">1000</profile>
-      <profile namespace="globus" key="LowOverAllocation">1000</profile>
-      <workdirectory>/homes/davidk/test4</workdirectory>
+      <workdirectory>/homes/{env.USER}/swiftwork</workdirectory>
    </pool>
 </config>
 

Modified: branches/release-0.94/tests/suite.sh
===================================================================
--- branches/release-0.94/tests/suite.sh	2013-09-04 16:27:20 UTC (rev 7031)
+++ branches/release-0.94/tests/suite.sh	2013-09-04 17:55:20 UTC (rev 7032)
@@ -979,7 +979,7 @@
   IFCONFIG=/sbin/ifconfig
 fi
 $IFCONFIG > /dev/null 2>&1 || crash "Cannot run ifconfig!"
-export GLOBUS_HOSTNAME=$( $IFCONFIG | grep inet | head -1 | cut -d ':' -f 2 | \
+export GLOBUS_HOSTNAME=$( $IFCONFIG 2>/dev/null | grep inet | head -1 | cut -d ':' -f 2 | \
                    awk '{print $1}' )
 [ $? != 0 ] && crash "Could not obtain GLOBUS_HOSTNAME!"