Deletege cloud environment creation task to common env setup task
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bf5d8c79 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bf5d8c79 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bf5d8c79 Branch: refs/heads/auroraMesosIntegration Commit: bf5d8c79645adf161d9121bb84ffcb4acd86f382 Parents: 4a92da4 Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 1 23:30:00 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 1 23:30:00 2016 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java | 4 ++-- .../airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5d8c79/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 02af9a3..6035cec 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 @@ -86,11 +86,11 @@ public class AuroraJobSubmission implements JobSubmissionTask{ IdentityBean owner = new IdentityBean(AuroraUtils.ROLE); // only autodoc vina String workingDir = taskContext.getWorkingDir(); - ProcessBean proc1 = new ProcessBean("process_1", "mkdir -p " + workingDir, false); +// ProcessBean proc1 = new ProcessBean("process_1", "mkdir -p " + workingDir, 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_screenM.sh", false); Set<ProcessBean> processes = new LinkedHashSet<>(); - processes.add(proc1); +// processes.add(proc1); processes.add(proc2); processes.add(proc3); http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5d8c79/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index 66bf5ca..b97e79a 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -291,9 +291,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ // TODO - breakdown unicore all in one task to multiple tasks, then we don't need to handle UNICORE here. taskIdList.addAll(createAndSaveSubmissionTasks(gatewayId, preferredJobSubmissionInterface, processModel, userGivenWallTime)); } else { - if(resourcePreference.getPreferredJobSubmissionProtocol() != JobSubmissionProtocol.CLOUD){ - taskIdList.addAll(createAndSaveEnvSetupTask(gatewayId, processModel, experimentCatalog)); - } + taskIdList.addAll(createAndSaveEnvSetupTask(gatewayId, processModel, experimentCatalog)); taskIdList.addAll(createAndSaveInputDataStagingTasks(processModel, gatewayId)); if (autoSchedule) { List<BatchQueue> definedBatchQueues = computeResource.getBatchQueues();
