[Swift-commit] r7987 - trunk/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-11 22:47:24 -0500 (Fri, 11 Jul 2014)
New Revision: 7987

Modified:
   trunk/resources/swift.conf.schema
Log:
updated config schema

Modified: trunk/resources/swift.conf.schema
===================================================================
--- trunk/resources/swift.conf.schema	2014-07-12 03:46:55 UTC (rev 7986)
+++ trunk/resources/swift.conf.schema	2014-07-12 03:47:24 UTC (rev 7987)
@@ -14,20 +14,29 @@
 			executable with the same name as the application"""   
 	}
 	
+	maxWallTime: "?Time"
+	
 	options {
 		_type: "?Object"
 		_doc:
 			""" Allows the definition of arbitrary application options. The meaning
 			of these options is largely dependent on the mechanism used to execute
 			the application. """
+		# known things
 		jobType: "?String"
+		jobQueue: "?String"
+		jobProject: "?String"
 		count: "?StrictlyPositiveInt"
+		# some specific provider stuff
+		pbs.aprun: "?Boolean"
+		pbs.mpp: "?Boolean"
+		depth: "?StrictlyPositiveInt"
+		ppn: "?StrictlyPositiveInt"
+		pbs.properties: "?String"
+		condor: "?Object"
 		"*": "?Object" 
-	}
+	}	
 	
-	jobType: "?String", jobQueue: "?String", jobProject: "?String"
-	maxWallTime: "?Time"
-	
 	env."*": "String"
 }
 
@@ -92,7 +101,16 @@
 			workerLoggingLevel: "?Choice[ERROR, WARN, INFO, DEBUG, TRACE]"
 			workerLoggingDirectory: "?String"
 			softImage: "?String"
-			"*": "?Object"
+			jobOptions {
+				"*": "?Object"
+				# known things
+				pbs.aprun: "?Boolean"
+				pbs.mpp: "?Boolean"
+				depth: "?StrictlyPositiveInt"
+				ppn: "?StrictlyPositiveInt"
+				pbs.properties: "?String"
+				condor: "?Object"
+			}
 		}
 	}
 	
@@ -101,14 +119,23 @@
 	
 	app."*": {
 		executable: "?String"
-	
+		maxWallTime: "?Time"
+		
 		options {
+			# known things
 			jobType: "?String"
+			jobQueue: "?String"
+			jobProject: "?String"
 			count: "?StrictlyPositiveInt"
-			"*": "?Object" 
+			# some specific provider stuff
+			pbs.aprun: "?Boolean"
+			pbs.mpp: "?Boolean"
+			depth: "?StrictlyPositiveInt"
+			ppn: "?StrictlyPositiveInt"
+			pbs.properties: "?String"
+			condor: "?Object"
+			"*": "?Object"
 		}
-		jobQueue: "?String", jobProject: "?String"
-		maxWallTime: "?Time"
 	
 		env."*": "String"
 	}