[Swift-commit] r6954 - SwiftTutorials/CIC_2013-08-09

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-08-22 11:49:47 -0500 (Thu, 22 Aug 2013)
New Revision: 6954

Modified:
   SwiftTutorials/CIC_2013-08-09/setup.sh
Log:
set OSG site file for part04-06 in setup script for dynamic internal host IP

Modified: SwiftTutorials/CIC_2013-08-09/setup.sh
===================================================================
--- SwiftTutorials/CIC_2013-08-09/setup.sh	2013-08-22 16:44:56 UTC (rev 6953)
+++ SwiftTutorials/CIC_2013-08-09/setup.sh	2013-08-22 16:49:47 UTC (rev 6954)
@@ -68,43 +68,67 @@
 
 END
 
-return
+if [ $(hostname) = uc3-sub.uchicago.edu ]; then
+  CONTACTHOST=128.135.158.243
+elif [ $(hostname) = login01.osgconnect.net ]; then
+  CONTACTHOST=128.135.158.173
+else
+  printf "\n\nERROR: Hostname $(hostname) is unknown: modiy setup.sh accordingly.\n\n"
+  return
+fi 
 
-# OLD, to remove:
+cat >>sites.condor<<END
 
-#The following line sets the default site
-site="uc3"
+<config>
+  <pool handle="osg">
+    <execution provider="coaster" jobmanager="local:condor"/>
+    <profile namespace="karajan" key="jobThrottle">5.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:01:00</profile>
+    <profile namespace="globus"  key="highOverAllocation">10000</profile>
+    <profile namespace="globus"  key="lowOverAllocation">10000</profile>
+    <profile namespace="globus"  key="internalHostname">$CONTACTHOST</profile>  <!-- FIXME Make Dynamic from setup -->
+    <profile namespace="globus"  key="slots">20</profile> 
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <!-- For UC3: -->
+    <profile namespace="globus"  key="condor.+AccountingGroup">"group_friends.{env.USER}"</profile>
+    <!-- For OSGConnect -->
+    <profile namespace="globus"  key="condor.+ProjectName">"swift"</profile>
+    <profile namespace="globus"  key="jobType">nonshared</profile>
 
-declare -a SITE_SPECIFIC=("part07 part08 part09 modis/modis01 modis/modis02 modis/modis03 modis/modis04 modis/modis05 modis/modis06");
+    <!-- UC3  --> <!-- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile> -->
+    <!-- UCIT --> <!-- <profile namespace="globus" key="condor.Requirements">regexp("appcloud[0-1][0-9].*", Machine)</profile> -->
+    <!-- MWUC --> <!-- <profile namespace="globus" key="condor.Requirements">regexp("uct2-c*", Machine)</profile> -->
+    <!-- MWIU --> <!-- <profile namespace="globus" key="condor.Requirements">regexp("iut2-c*", Machine)</profile> -->
+    <!-- MWUI --> <!-- <profile namespace="globus" key="condor.Requirements">regexp("taub*", Machine)</profile> -->
+    <!-- MWT2 --> <!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
+    <!-- OSG  --> <!-- <profile namespace="globus" key="condor.Requirements">isUndefined(GLIDECLIENT_Name) == FALSE</profile> -->
+    <!-- MULT --> <!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org" && (regexp("iut2-c*", Machine) || regexp("uct2-c*", Machine)) </profile> -->
 
-site_setup()
-{
-    SITEPATH="site_catalog/$1"
-    if [ -x "$SITEPATH/setup.sh" ]; then
-	echo "Sourcing site specific setup"
-	source ./$SITEPATH/setup.sh
-    fi
-    if [ -f "$SITEPATH/sites.xml" ]; then
-	for tutorial in ${SITE_SPECIFIC[*]}
-	do
-	  cp "$SITEPATH/sites.xml" $tutorial/
-	done
-    fi
-    if [ -f "$SITEPATH/apps" ]; then
-	for tutorial in ${SITE_SPECIFIC[*]}
-	do
-	  cp "$SITEPATH/apps" $tutorial/
-	done
-    fi
-}
+    <workdirectory>.</workdirectory> <!-- VERIFY OK FOR ALL OSG! -->
+  </pool>
+</config>
 
-if [ ! -z $1 ]; then
-    if [ -d "site_catalog/$1" ]; then
-	site="$1"
-    else
-	echo "Requested site not present in catalog: Setting to default site"	
-    fi
-fi
-echo "Site selected : $site"
-site_setup $site
+<!--
 
+MWT2 @UC Requirements = regexp("uct2-c*", Machine)
+MWT2 @IU Requirements = regexp("iut2-c*", Machine)
+MWT2 @UIUC Requirements = regexp("taub*", Machine)
+UC ATLAS Tier 3	Requirements = regexp("uct3*", Machine)
+ITS Virtualization Lab Requirements = regexp("appcloud[0-1][0-9].*", Machine)
+Open Science Grid
+Requirements = isUndefined(GLIDECLIENT_Name) == FALSE
+
+ -->
+END
+
+return #DEBUG !!!
+
+for p in 04 05 06; do
+  cp sites.condor part${p}/sites.xml
+done
+
+return