You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/10/27 12:53:16 UTC
airavata git commit: adding conditions to PBS script for BR2
Repository: airavata
Updated Branches:
refs/heads/master d96f35ac2 -> 3de33acf2
adding conditions to PBS script for BR2
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3de33acf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3de33acf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3de33acf
Branch: refs/heads/master
Commit: 3de33acf281173a88748697522fb7a01a8e0de20
Parents: d96f35a
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Oct 27 07:53:07 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Oct 27 07:53:07 2015 -0400
----------------------------------------------------------------------
.../server/src/main/resources/PBSTemplate.xslt | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3de33acf/modules/configuration/server/src/main/resources/PBSTemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/PBSTemplate.xslt b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
index 75b71b2..755d850 100644
--- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt
+++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
@@ -61,6 +61,11 @@
<xsl:text>
</xsl:text>
</xsl:when>
</xsl:choose>
+ <xsl:choose>
+ <xsl:when test="ns:jobSubmitterCommand = 'ccmrun'">
+#PBS -l gres=ccm
+ </xsl:when>
+ </xsl:choose>
<xsl:text>
</xsl:text>
<xsl:for-each select="ns:exports/ns:name">
<xsl:value-of select="."/>=<xsl:value-of select="./@value"/><xsl:text>
</xsl:text>
@@ -80,9 +85,10 @@ cd <xsl:text> </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text
</xsl:for-each>
<xsl:text>
</xsl:text>
<xsl:choose><xsl:when test="ns:jobSubmitterCommand != ''">
-<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text> </xsl:text>
-<xsl:value-of select="ns:cpuCount"/><xsl:text> </xsl:text>
- </xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text>
+ <xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text> </xsl:text>
+ <xsl:choose><xsl:when test="ns:jobSubmitterCommand != 'ccmrun'">
+ <xsl:value-of select="ns:cpuCount"/> </xsl:when></xsl:choose><xsl:text> </xsl:text>
+ </xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text>
<xsl:for-each select="ns:inputs/ns:input">
<xsl:value-of select="."/><xsl:text> </xsl:text>
</xsl:for-each>