You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/08/01 20:01:31 UTC
[airavata] 01/01: Merge branch 'staging' into develop
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 658550e35fd3dc08b8d4b79a42f45322e9868cfe
Merge: bcf97ce 2bbfd8c
Author: dimuthu <di...@gmail.com>
AuthorDate: Wed Aug 1 15:58:23 2018 -0400
Merge branch 'staging' into develop
.../scigap/staging/group_vars/all/vars.yml | 2 +-
.../pga_config/{ultrascan => scigap}/vars.yml | 31 ++--
.../scigap/staging/pga_config/scigap/vault.yml | 18 +++
.../pga_config/{ultrascan => seagrid}/vars.yml | 31 ++--
.../scigap/staging/pga_config/seagrid/vault.yml | 18 +++
.../pga_config/{ultrascan => testdrive}/vars.yml | 31 ++--
.../scigap/staging/pga_config/testdrive/vault.yml | 18 +++
.../scigap/staging/pga_config/ultrascan/vars.yml | 2 +-
.../inventories/scigap/testing/files/airavata.jks | Bin 0 -> 2623 bytes
.../scigap/testing/files/airavata_sym.jks | 30 ++++
.../scigap/testing/files/client_truststore.jks | Bin 0 -> 971 bytes
.../inventories/scigap/testing/files/keycloak.jks | 143 +++++++++++++++++
.../{staging => testing}/group_vars/all/vars.yml | 8 +-
.../scigap/testing/group_vars/all/vault.yml | 33 ++++
dev-tools/ansible/inventories/scigap/testing/hosts | 27 ++++
.../pga_config/scigap}/vars.yml | 33 ++--
.../scigap/testing/pga_config/scigap/vault.yml | 18 +++
.../pga_config/seagrid}/vars.yml | 33 ++--
.../scigap/testing/pga_config/seagrid/vault.yml | 18 +++
.../pga_config/testdrive}/vars.yml | 33 ++--
.../scigap/testing/pga_config/testdrive/vault.yml | 18 +++
.../standalone/group_vars/helix/vars.yml | 2 +-
dev-tools/ansible/pga-scigap-staging.yml | 3 +
...a-scigap-staging.yml => pga-scigap-testing.yml} | 4 +-
.../templates/email-monitor/email-config.yaml.j2 | 28 +++-
.../apache/airavata/agents/api/AgentAdaptor.java | 2 +
.../airavata/helix/agent/ssh/SshAgentAdaptor.java | 7 +-
.../airavata/helix/adaptor/PoolingSSHJClient.java | 73 +++++++--
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 35 +++-
.../airavata/helix/impl/task/AiravataTask.java | 37 +++++
.../airavata/helix/impl/task/TaskContext.java | 8 +
.../task/cancel/RemoteJobCancellationTask.java | 5 +
.../airavata/helix/impl/task/env/EnvSetupTask.java | 6 +-
.../impl/task/submission/JobSubmissionTask.java | 4 +-
modules/airavata-helix/task-api/pom.xml | 2 +-
.../helix/core/support/adaptor/AgentStore.java | 4 +-
.../resources/email-monitor/conf/email-config.yaml | 28 +++-
.../core/validator/impl/BatchQueueValidator.java | 178 +++++++++++----------
.../cpi/impl/SimpleOrchestratorImpl.java | 5 +-
.../server/OrchestratorServerHandler.java | 10 +-
.../DeltaScripts/profile_service_schema_delta.sql | 1 +
41 files changed, 772 insertions(+), 215 deletions(-)