Repository: airavata Updated Branches: refs/heads/master e0df621b6 -> dbe9c8cb9
Fixed the job name issue. AIRAVATA-1640 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dbe9c8cb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dbe9c8cb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dbe9c8cb Branch: refs/heads/master Commit: dbe9c8cb9c34374963de92f10f23ac35923d2e5c Parents: e0df621 Author: raminder <[email protected]> Authored: Mon Mar 30 09:43:39 2015 -0400 Committer: raminder <[email protected]> Committed: Mon Mar 30 09:43:39 2015 -0400 ---------------------------------------------------------------------- modules/configuration/server/src/main/resources/PBSTemplate.xslt | 2 +- .../main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/dbe9c8cb/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 fe94ef1..033534e 100644 --- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt +++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt @@ -9,7 +9,7 @@ <xsl:output method="text" /> <xsl:template match="/ns:JobDescriptor"> <xsl:param name="quote">"</xsl:param> -#! /bin/sh +#! /bin/bash # PBS batch job submission script generated by Apache Airavata # <xsl:choose> <xsl:when test="ns:shellName != ''"> http://git-wip-us.apache.org/repos/asf/airavata/blob/dbe9c8cb/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index f477f62..588183e 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -331,7 +331,8 @@ public class GFACSSHUtils { if (computationalProjectAccount != null) { jobDescriptor.setAcountString(computationalProjectAccount); } - jobDescriptor.setJobName(String.valueOf(generateJobName())); + // To make job name alpha numeric + jobDescriptor.setJobName("A" + String.valueOf(generateJobName())); jobDescriptor.setWorkingDirectory(jobExecutionContext.getWorkingDir()); List<String> inputValues = new ArrayList<String>();
