[Swift-commit] r4979 - in branches/release-0.93: bin tests/groups tests/providers/persistent-coasters/mcs
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Wed Aug 10 17:36:00 CDT 2011
Author: davidk
Date: 2011-08-10 17:35:59 -0500 (Wed, 10 Aug 2011)
New Revision: 4979
Added:
branches/release-0.93/tests/groups/mcs.sh
Removed:
branches/release-0.93/tests/providers/persistent-coasters/mcs/sites.template.xml
branches/release-0.93/tests/providers/persistent-coasters/mcs/tc.template.data
Modified:
branches/release-0.93/bin/gensites
branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh
branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh
branches/release-0.93/tests/providers/persistent-coasters/mcs/README
Log:
Fixes to make mcs persistent provider test run
Modified: branches/release-0.93/bin/gensites
===================================================================
--- branches/release-0.93/bin/gensites 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/bin/gensites 2011-08-10 22:35:59 UTC (rev 4979)
@@ -181,9 +181,6 @@
esac
done < $PROPERTIES_FILE
-# Test for mandatory variables
-[[ ${WORK} == "" ]] && crash "Not specified: WORK"
-
# Verify that the variables by the template are defined
for TOKEN in NODES HOST WORK PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME MAXTIME EXECUTION_URL
do
Added: branches/release-0.93/tests/groups/mcs.sh
===================================================================
--- branches/release-0.93/tests/groups/mcs.sh (rev 0)
+++ branches/release-0.93/tests/groups/mcs.sh 2011-08-10 22:35:59 UTC (rev 4979)
@@ -0,0 +1,6 @@
+# Group for MCS provider test (persistent coasters)
+
+GROUPLIST=(
+ $TESTDIR/providers/persistent-coasters/mcs
+ )
+
Modified: branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh
===================================================================
--- branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh 2011-08-10 22:35:59 UTC (rev 4979)
@@ -1,4 +1,3 @@
#!/bin/bash
stop-coaster-service
-
Modified: branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh 2011-08-10 22:35:59 UTC (rev 4979)
@@ -1,5 +1,7 @@
#!/bin/bash
+mkdir -p ~/work
cp -v $GROUP/data.txt . || exit 1
cp -v $GROUP/*expected . || exit 1
+export WORK=$HOME/work
start-coaster-service || exit 1
Modified: branches/release-0.93/tests/providers/persistent-coasters/mcs/README
===================================================================
--- branches/release-0.93/tests/providers/persistent-coasters/mcs/README 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/tests/providers/persistent-coasters/mcs/README 2011-08-10 22:35:59 UTC (rev 4979)
@@ -1 +1,58 @@
Before running this test, be sure to copy coaster-service.conf to your swift etc directory
+
+There are no templates in this directory. start-coaster-service generates sites.xml from the persistent-coasters template
+
+Be sure that you have all the hosts properly configured in ~/.ssh/auth.defaults. You can use the example below as a template.
+
+crush.mcs.anl.gov.type=key
+crush.mcs.anl.gov.username=davidk
+crush.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+crush.mcs.anl.gov.passphrase=your passphrase here
+
+thwomp.mcs.anl.gov.type=key
+thwomp.mcs.anl.gov.username=davidk
+thwomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+thwomp.mcs.anl.gov.passphrase=your passphrase here
+
+stomp.mcs.anl.gov.type=key
+stomp.mcs.anl.gov.username=davidk
+stomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+stomp.mcs.anl.gov.passphrase=your passphrase here
+
+crank.mcs.anl.gov.type=key
+crank.mcs.anl.gov.username=davidk
+crank.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+crank.mcs.anl.gov.passphrase=your passphrase here
+
+steamroller.mcs.anl.gov.type=key
+steamroller.mcs.anl.gov.username=davidk
+steamroller.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+steamroller.mcs.anl.gov.passphrase=your passphrase here
+
+grind.mcs.anl.gov.type=key
+grind.mcs.anl.gov.username=davidk
+grind.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+grind.mcs.anl.gov.passphrase=your passphrase here
+
+churn.mcs.anl.gov.type=key
+churn.mcs.anl.gov.username=davidk
+churn.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+churn.mcs.anl.gov.passphrase=your passphrase here
+
+trounce.mcs.anl.gov.type=key
+trounce.mcs.anl.gov.username=davidk
+trounce.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+trounce.mcs.anl.gov.passphrase=your passphrase here
+
+thrash.mcs.anl.gov.type=key
+thrash.mcs.anl.gov.username=davidk
+thrash.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+thrash.mcs.anl.gov.passphrase=your passphrase here
+
+vanquish.mcs.anl.gov.type=key
+vanquish.mcs.anl.gov.username=davidk
+vanquish.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+vanquish.mcs.anl.gov.passphrase=your passphrase here
+
+
+
Deleted: branches/release-0.93/tests/providers/persistent-coasters/mcs/sites.template.xml
===================================================================
--- branches/release-0.93/tests/providers/persistent-coasters/mcs/sites.template.xml 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/tests/providers/persistent-coasters/mcs/sites.template.xml 2011-08-10 22:35:59 UTC (rev 4979)
@@ -1,13 +0,0 @@
-<config>
- <pool handle="persistent-coasters">
- <execution provider="coaster-persistent"
- url="_EXECUTION_URL_"
- jobmanager="local:local"/>
- <profile namespace="globus" key="workerManager">passive</profile>
- <profile namespace="globus" key="workersPerNode">4</profile>
- <profile key="jobThrottle" namespace="karajan">.03</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>_WORK_</workdirectory>
- </pool>
-</config>
Deleted: branches/release-0.93/tests/providers/persistent-coasters/mcs/tc.template.data
===================================================================
--- branches/release-0.93/tests/providers/persistent-coasters/mcs/tc.template.data 2011-08-10 20:22:59 UTC (rev 4978)
+++ branches/release-0.93/tests/providers/persistent-coasters/mcs/tc.template.data 2011-08-10 22:35:59 UTC (rev 4979)
@@ -1,7 +0,0 @@
-persistent-coasters echo /bin/echo INSTALLED INTEL32::LINUX
-persistent-coasters cat /bin/cat INSTALLED INTEL32::LINUX
-persistent-coasters ls /bin/ls INSTALLED INTEL32::LINUX
-persistent-coasters grep /bin/grep INSTALLED INTEL32::LINUX
-persistent-coasters sort /bin/sort INSTALLED INTEL32::LINUX
-persistent-coasters paste /bin/paste INSTALLED INTEL32::LINUX
-persistent-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX
More information about the Swift-commit
mailing list