Merge pull request #63 from christopherwharrop/release/1.3.0

Release/1.3.0
christopherwharrop · May 29, 2019 · 91569ac · 91569ac
2 parents ce9fe8a + 5f37e33
commit 91569ac
Show file tree

Hide file tree

Showing 8 changed files with 298 additions and 246 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,6 +3,8 @@
 ## New for Version 1.3.0
 
 * Update SLURM support to handle pack groups
+* Update SLURM support to map `<queue>` to --qos instead of --partition
+* Update SLURM support to map `<partition>` to --partition
 * Update LSF support to handle additional methods LSF uses to report the exit status
 * All rocoto commands have the same -a, -c, -m, and -t options
 * The -c and -t options can now select by cycledefs and attributes (ie. final)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.4
+1.3.0
diff --git a/lib/wfmstat/wfmstatoption.rb b/lib/wfmstat/wfmstatoption.rb
@@ -53,6 +53,11 @@ def add_opts(opts)
         @summary=true
       end
 
+      # task order
+      opts.on("-T","--task-sort","Sort by task") do
+        @taskfirst=true
+      end
+
     end # add_opts
 
     def make_selection()

diff --git a/lib/workflowmgr/schema_with_metatasks.rng b/lib/workflowmgr/schema_with_metatasks.rng
@@ -465,14 +465,30 @@
           </element>
         </optional>
 
-        <!-- Either one cores tag or one nodes tag-->
+        <!-- Either one cores tag or one nodes or at least one native tag is required-->
         <choice>
-          <element name="cores">
-            <data type="positiveInteger"/>          
-          </element>
-          <element name="nodes">
-            <data type="string"/>          
-          </element>
+          <interleave>
+	    <choice>
+	      <element name="cores">
+		<data type="positiveInteger"/>
+	      </element>
+	      <element name="nodes">
+		<data type="string"/>
+	      </element>
+	    </choice>
+	    <optional>
+              <oneOrMore>
+	        <element name="native">
+		  <ref name="compoundTimeString"/>
+	        </element>
+              </oneOrMore>
+	    </optional>
+          </interleave>
+          <oneOrMore>
+            <element name="native">
+              <ref name="compoundTimeString"/>
+            </element>
+          </oneOrMore>
         </choice>
 
         <!-- One walltime tag -->
@@ -518,15 +534,6 @@
           </element>
         </optional>
 
-        <!-- One or more native tags -->
-        <optional>
-          <oneOrMore>
-            <element name="native">
-              <ref name="compoundTimeString"/>
-            </element>
-          </oneOrMore>
-        </optional>
-
         <!-- Optional nodesize tag -->
         <optional>
           <element name="nodesize">

diff --git a/lib/workflowmgr/schema_without_metatasks.rng b/lib/workflowmgr/schema_without_metatasks.rng
@@ -446,14 +446,30 @@
           </element>
         </optional>
 
-        <!-- Either one cores tag or one nodes tag-->
+        <!-- Either one cores tag or one nodes or at least one native tag is required-->
         <choice>
-          <element name="cores">
-            <data type="positiveInteger"/>
-          </element>
-          <element name="nodes">
-            <data type="string"/>
-          </element>
+          <interleave>
+	    <choice>
+	      <element name="cores">
+		<data type="positiveInteger"/>
+	      </element>
+	      <element name="nodes">
+		<data type="string"/>
+	      </element>
+	    </choice>
+	    <optional>
+              <oneOrMore>
+	        <element name="native">
+		  <ref name="compoundTimeString"/>
+	        </element>
+              </oneOrMore>
+	    </optional>
+          </interleave>
+          <oneOrMore>
+            <element name="native">
+              <ref name="compoundTimeString"/>
+            </element>
+          </oneOrMore>
         </choice>
 
         <!-- One walltime tag -->
@@ -499,15 +515,6 @@
           </element>
         </optional>
 
-        <!-- Zero or more native tags -->
-        <optional>
-          <oneOrMore>
-            <element name="native">
-              <ref name="compoundTimeString"/>
-            </element>
-          </oneOrMore>
-        </optional>
-
         <!-- Optional nodesize tag -->
         <optional>
           <element name="nodesize">