update aurora process order and hostname
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/873d684f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/873d684f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/873d684f Branch: refs/heads/auroraMesosIntegration Commit: 873d684f6c7eb4bc49c68e06134db08de8e2512b Parents: 6d32613 Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 1 21:50:48 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 1 21:50:48 2016 -0400 ---------------------------------------------------------------------- .../aurora-client/src/main/resources/aurora-scheduler.properties | 2 +- .../org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/873d684f/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties ---------------------------------------------------------------------- diff --git a/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties b/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties index 20e1973..cf21b8f 100644 --- a/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties +++ b/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties @@ -1,6 +1,6 @@ #Aurora scheduler properties -aurora.scheduler.host=52.15.103.85â +aurora.scheduler.host=52.15.103.85 aurora.scheduler.port=8081 http://git-wip-us.apache.org/repos/asf/airavata/blob/873d684f/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java index 1c2596c..379f7e9 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java @@ -87,8 +87,8 @@ public class AuroraJobSubmission implements JobSubmissionTask{ // only autodoc vina String workingDir = taskContext.getWorkingDir(); ProcessBean proc1 = new ProcessBean("process_1", "mkdir -p " + workingDir, false); - ProcessBean proc2 = new ProcessBean("process_1", "cp -rf /home/centos/efs-mount-point/autodock-vina/* " + workingDir , false); - ProcessBean proc3 = new ProcessBean("process_2", "cd " + workingDir + " && ./vina_screenA.sh", false); + ProcessBean proc2 = new ProcessBean("process_2", "cp -rf /home/centos/efs-mount-point/autodock-vina/* " + workingDir , false); + ProcessBean proc3 = new ProcessBean("process_3", "cd " + workingDir + " && ./vina_screenA.sh", false); Set<ProcessBean> processes = new LinkedHashSet<>(); processes.add(proc1); processes.add(proc2);
