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

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-09-04 11:27:20 -0500 (Wed, 04 Sep 2013)
New Revision: 7031

Modified:
   branches/release-0.94/tests/sites/blues/sites.template.xml
   branches/release-0.94/tests/sites/fusion/sanity.setup.sh
   branches/release-0.94/tests/sites/raven/sanity.setup.sh
   branches/release-0.94/tests/sites/stampede/sanity.setup.sh
   branches/release-0.94/tests/user_env.sh
Log:
Add ability to override usernames for more machines


Modified: branches/release-0.94/tests/sites/blues/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/blues/sites.template.xml	2013-09-04 04:26:29 UTC (rev 7030)
+++ branches/release-0.94/tests/sites/blues/sites.template.xml	2013-09-04 16:27:20 UTC (rev 7031)
@@ -1,6 +1,6 @@
 <config>
     <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>
@@ -13,6 +13,6 @@
         <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>

Modified: branches/release-0.94/tests/sites/fusion/sanity.setup.sh
===================================================================
--- branches/release-0.94/tests/sites/fusion/sanity.setup.sh	2013-09-04 04:26:29 UTC (rev 7030)
+++ branches/release-0.94/tests/sites/fusion/sanity.setup.sh	2013-09-04 16:27:20 UTC (rev 7031)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-USERNAME=$BLUES_USERNAME
+USERNAME=$FUSION_USERNAME
 
 if [[ -z $USERNAME ]] 
 then

Modified: branches/release-0.94/tests/sites/raven/sanity.setup.sh
===================================================================
--- branches/release-0.94/tests/sites/raven/sanity.setup.sh	2013-09-04 04:26:29 UTC (rev 7030)
+++ branches/release-0.94/tests/sites/raven/sanity.setup.sh	2013-09-04 16:27:20 UTC (rev 7031)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-USERNAME=$BLUES_USERNAME
+USERNAME=$RAVEN_USERNAME
 
 if [[ -z $USERNAME ]] 
 then

Modified: branches/release-0.94/tests/sites/stampede/sanity.setup.sh
===================================================================
--- branches/release-0.94/tests/sites/stampede/sanity.setup.sh	2013-09-04 04:26:29 UTC (rev 7030)
+++ branches/release-0.94/tests/sites/stampede/sanity.setup.sh	2013-09-04 16:27:20 UTC (rev 7031)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-USERNAME=$BLUES_USERNAME
+USERNAME=$STAMPEDE_USERNAME
 
 if [[ -z $USERNAME ]] 
 then

Modified: branches/release-0.94/tests/user_env.sh
===================================================================
--- branches/release-0.94/tests/user_env.sh	2013-09-04 04:26:29 UTC (rev 7030)
+++ branches/release-0.94/tests/user_env.sh	2013-09-04 16:27:20 UTC (rev 7031)
@@ -1,6 +1,10 @@
 export BEAGLE_USERNAME=""
+export BLUES_USERNAME=""
+export FUSION_USERNAME=""
+export MCS_USERNAME=""
 export MIDWAY_USERNAME=""
-export MCS_USERNAME=""
+export RAVEN_USERNAME=""
+export STAMPEDE_USERNAME=""
 export UC3_USERNAME=""
 
 if [ $( hostname ) == "midway001" ]