[Swift-commit] r8016 - in trunk/tests: . cdm/ps cdm/ps/pinned language-behaviour/procedures/dynamic-output/provider-staging-coasters language-behaviour/procedures/dynamic-output/provider-staging-local language-behaviour/procedures/dynamic-output/swift-staging mpi/beagle/long mpi/beagle/short mpi/crow/long mpi/crow/short mpi/fusion/long mpi/fusion/short mpi/local sites/local sites/local-coasters sites/todo/fusion sites/todo/ibicluster sites/todo/intrepid sites/todo/surveyor
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sun Jul 13 00:00:12 CDT 2014
Author: hategan
Date: 2014-07-13 00:00:12 -0500 (Sun, 13 Jul 2014)
New Revision: 8016
Modified:
trunk/tests/cdm/ps/pinned/swift.conf
trunk/tests/cdm/ps/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf
trunk/tests/mpi/beagle/long/swift.conf
trunk/tests/mpi/beagle/short/swift.conf
trunk/tests/mpi/crow/long/swift.conf
trunk/tests/mpi/crow/short/swift.conf
trunk/tests/mpi/fusion/long/swift.conf
trunk/tests/mpi/fusion/short/swift.conf
trunk/tests/mpi/local/swift.conf
trunk/tests/sites/local-coasters/swift.conf
trunk/tests/sites/local/swift.conf
trunk/tests/sites/todo/fusion/swift.conf
trunk/tests/sites/todo/ibicluster/swift.conf
trunk/tests/sites/todo/intrepid/swift.conf
trunk/tests/sites/todo/surveyor/swift.conf
trunk/tests/suite.sh
Log:
updated test stuff
Modified: trunk/tests/cdm/ps/pinned/swift.conf
===================================================================
--- trunk/tests/cdm/ps/pinned/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/cdm/ps/pinned/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,7 +9,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
app.cat {
executable: "/bin/cat"
@@ -43,7 +43,7 @@
URL: "localhost"
jobManager: "local:local"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 1
maxNodesPerJob: 4
maxJobs: 8
@@ -55,7 +55,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 255
initialParallelTasks: 255
app.cp {
@@ -63,7 +63,7 @@
}
app.merge {
- executable: "_DIR_/merge.sh"
+ executable: ${env.DIR}"/merge.sh"
}
}
Modified: trunk/tests/cdm/ps/swift.conf
===================================================================
--- trunk/tests/cdm/ps/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/cdm/ps/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,7 +9,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
app.cat {
executable: "/bin/cat"
@@ -43,7 +43,7 @@
URL: "localhost"
jobManager: "local:local"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 1
maxNodesPerJob: 4
maxJobs: 8
@@ -55,7 +55,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 255
initialParallelTasks: 255
app.cp {
@@ -63,7 +63,7 @@
}
app.merge {
- executable: "_DIR_/merge.sh"
+ executable: ${env.DIR}"/merge.sh"
}
}
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -6,7 +6,7 @@
URL: "localhost"
jobManager: "local:local"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 1
maxNodesPerJob: 4
maxJobs: 8
@@ -15,9 +15,13 @@
}
}
staging: "local"
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 255
initialParallelTasks: 255
+
+ app.gen {
+ executable: ${env.DIR}"/gen.sh"
+ }
}
sites: localhost
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,8 +9,12 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
+
+ app.gen {
+ executable: ${env.DIR}"/gen.sh"
+ }
}
sites: localhost
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,8 +9,12 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
+
+ app.gen {
+ executable: ${env.DIR}"/gen.sh"
+ }
}
sites: localhost
Modified: trunk/tests/mpi/beagle/long/swift.conf
===================================================================
--- trunk/tests/mpi/beagle/long/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/beagle/long/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -15,7 +15,7 @@
pbs.mpp: true
depth: "1"
}
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
jobMaxTime: "02:00:00"
}
@@ -24,17 +24,17 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
app.mpi_sleep {
- executable: "_DIR_/mpi-sleep"
+ executable: ${env.DIR}"/mpi-sleep"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/beagle/short/swift.conf
===================================================================
--- trunk/tests/mpi/beagle/short/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/beagle/short/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -15,7 +15,7 @@
pbs.mpp: true
depth: "6"
}
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
jobMaxTime: "02:00:00"
}
@@ -24,11 +24,11 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/crow/long/swift.conf
===================================================================
--- trunk/tests/mpi/crow/long/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/crow/long/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -15,7 +15,7 @@
pbs.mpp: true
depth: "6"
}
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
jobMaxTime: "02:00:00"
}
@@ -24,17 +24,17 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
app.mpi_sleep {
- executable: "_DIR_/mpi-sleep"
+ executable: ${env.DIR}"/mpi-sleep"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/crow/short/swift.conf
===================================================================
--- trunk/tests/mpi/crow/short/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/crow/short/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -15,7 +15,7 @@
pbs.mpp: true
depth: "6"
}
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
jobMaxTime: "02:00:00"
}
@@ -24,11 +24,11 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {hostCount: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/fusion/long/swift.conf
===================================================================
--- trunk/tests/mpi/fusion/long/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/fusion/long/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -11,7 +11,7 @@
maxNodesPerJob: 2
workerLoggingLevel: "DEBUG"
maxJobs: 1
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
}
}
@@ -19,11 +19,11 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_sleep {
- executable: "_DIR_/mpi-sleep"
+ executable: ${env.DIR}"/mpi-sleep"
options {mpi.processes: "4", mpi.ppn: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/fusion/short/swift.conf
===================================================================
--- trunk/tests/mpi/fusion/short/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/fusion/short/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -10,7 +10,7 @@
maxNodesPerJob: 4
workerLoggingLevel: "DEBUG"
maxJobs: 1
- workerLoggingDirectory: "{wdir}"
+ workerLoggingDirectory: ${env.PWD}/work
tasksPerNode: 1
jobMaxTime: "02:00:00"
}
@@ -19,11 +19,11 @@
type: "local"
URL: "none"
}
- workDirectory: "{wdir}"
+ workDirectory: ${env.PWD}/work
maxParallelTasks: 600
initialParallelTasks: 599
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {mpi.processes: "2"}
maxWallTime: "00:01:00"
}
Modified: trunk/tests/mpi/local/swift.conf
===================================================================
--- trunk/tests/mpi/local/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/mpi/local/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,7 +9,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
app.cat {
executable: "/bin/cat"
@@ -47,7 +47,7 @@
URL: "localhost"
jobManager: "local:local"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 1
maxNodesPerJob: 4
maxJobs: 8
@@ -59,11 +59,11 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 255
initialParallelTasks: 255
app.mpi_cp {
- executable: "_DIR_/mpi-cp"
+ executable: ${env.DIR}"/mpi-cp"
options {hostCount: "2"}
}
Modified: trunk/tests/sites/local/swift.conf
===================================================================
--- trunk/tests/sites/local/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/local/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,7 +9,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 32
initialParallelTasks: 31
app.cat {
Modified: trunk/tests/sites/local-coasters/swift.conf
===================================================================
--- trunk/tests/sites/local-coasters/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/local-coasters/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -9,7 +9,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
OS: "INTEL32::LINUX"
app.cat {
executable: "/bin/cat"
@@ -43,7 +43,7 @@
URL: "localhost"
jobManager: "local:local"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 1
maxNodesPerJob: 4
maxJobs: 8
@@ -55,7 +55,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 255
initialParallelTasks: 255
app.cp {
Modified: trunk/tests/sites/todo/fusion/swift.conf
===================================================================
--- trunk/tests/sites/todo/fusion/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/todo/fusion/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -18,7 +18,7 @@
type: "local"
URL: "none"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 600
initialParallelTasks: 599
app.cat {
Modified: trunk/tests/sites/todo/ibicluster/swift.conf
===================================================================
--- trunk/tests/sites/todo/ibicluster/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/todo/ibicluster/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -17,7 +17,7 @@
type: "local"
URL: "none"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 16
initialParallelTasks: 16
app.cat {
Modified: trunk/tests/sites/todo/intrepid/swift.conf
===================================================================
--- trunk/tests/sites/todo/intrepid/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/todo/intrepid/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -19,16 +19,16 @@
URL: "localhost"
jobManager: "local:cobalt"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 512
maxNodesPerJob: 512
- jobQueue: "_QUEUE_"
+ jobQueue: ${env.QUEUE}
workerLoggingLevel: "DEBUG"
maxJobs: 1
# Option ignored: globus:alcfbgpnat = true
jobMaxTime: "00:15:00"
# Option ignored: globus:kernelprofile = zeptoos
- jobProject: "_PROJECT_"
+ jobProject: ${env.PROJECT}
tasksPerNode: 1
}
}
@@ -36,7 +36,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 512
initialParallelTasks: 511
app.cp {
Modified: trunk/tests/sites/todo/surveyor/swift.conf
===================================================================
--- trunk/tests/sites/todo/surveyor/swift.conf 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/sites/todo/surveyor/swift.conf 2014-07-13 05:00:12 UTC (rev 8016)
@@ -6,16 +6,16 @@
URL: "localhost"
jobManager: "local:cobalt"
options {
- internalHostname: "_HOST_"
+ internalHostname: ${env.HOST}
nodeGranularity: 64
maxNodesPerJob: 64
- jobQueue: "_QUEUE_"
+ jobQueue: ${env.QUEUE}
workerLoggingLevel: "DEBUG"
maxJobs: 1
# Option ignored: globus:alcfbgpnat = true
jobMaxTime: "00:15:00"
# Option ignored: globus:kernelprofile = zeptoos
- jobProject: "_PROJECT_"
+ jobProject: ${env.PROJECT}
tasksPerNode: 1
}
}
@@ -23,7 +23,7 @@
type: "local"
URL: "localhost"
}
- workDirectory: "_WORK_"
+ workDirectory: ${env.WORK}
maxParallelTasks: 2101
initialParallelTasks: 2097
app.cat {
Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh 2014-07-12 23:30:33 UTC (rev 8015)
+++ trunk/tests/suite.sh 2014-07-13 05:00:12 UTC (rev 8016)
@@ -990,14 +990,14 @@
fi
}
-# Generate swift.properties
+# Generate swift.conf
group_swift_properties() {
if [ -f $GROUP/swift.conf ]; then
cp -v $GROUP/swift.conf .
HASCONF=1
- [ $? != 0 ] && crash "Could not copy swift.properties!"
+ [ $? != 0 ] && crash "Could not copy swift.conf!"
else
- HASCONF=0
+ HASCONF=0
fi
}
More information about the Swift-commit
mailing list