Skip to content

Commit

Permalink
Merge pull request #1719 from ESMCI/erichlf/batch/email
Browse files Browse the repository at this point in the history
Add Support for Email Options

Added an email option to env_batch.xml. Also, add the ability to send an email option through case.submit. The flags in case.submit follow slurm's usage, i.e. --mail-user and --mail-type, where type here is never, all, begin, end, fail.

Test suite: scripts_regression_tests.py (Anvil, Skybridge, and Climate)
various email options passed to case.submit on the above three machines, and similarly in env_batch.xml.
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #797

User interface changes?: Added --mail-user and --mail-type to case.submit

Update gh-pages html (Y/N)?: N

Code review: @jgfouca @jedwards4b
  • Loading branch information
jgfouca authored Jul 14, 2017
2 parents 16070a4 + bb19ad6 commit 7a2739f
Show file tree
Hide file tree
Showing 10 changed files with 443 additions and 323 deletions.
317 changes: 186 additions & 131 deletions config/acme/machines/config_batch.xml

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions config/acme/machines/config_batch.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<xs:complexType>
<xs:sequence>

<!-- definition of batch_system complex elements -->
<xs:element name="batch_system" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<!-- definition of batch_system complex elements -->
<xs:element name="batch_system" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>

<xs:element name="batch_query" minOccurs="1" maxOccurs="1">
<xs:element name="batch_query" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
Expand All @@ -22,33 +22,33 @@
</xs:complexType>
</xs:element>

<xs:element name="batch_submit" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="batch_redirect" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_directive" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_submit" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="batch_redirect" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_directive" type="xs:string" minOccurs="0" maxOccurs="1"/>

<xs:element name="directives" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="directives" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>

<xs:element name="directive" minOccurs="0" maxOccurs="unbounded">
<xs:element name="directive" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="default" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="default" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:element>

</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

</xs:sequence>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:sequence>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>

</xs:sequence>
Expand Down
1 change: 0 additions & 1 deletion config/acme/machines/template.case.run
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ OR
parser.add_argument("--caseroot",
help="Case directory to build")


parser.add_argument("--skip-preview-namelist", action="store_true",
help="Skip calling preview-namelist during case.run")

Expand Down
Loading

0 comments on commit 7a2739f

Please sign in to comment.