You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/01/30 20:37:15 UTC
[airavata] branch develop updated (ad5ce3b -> 73ca271)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from ad5ce3b Adding CILogon to dev amp gateway
add a2dad12 Deploying SMALTR gateway
add 10aaaf7 Deploying SMALTR gateway
add a78af84 Deploying SMALTR gateway
add 863f2be Merge branch 'master' of https://github.com/apache/airavata
add eef825a Merge branch 'master' of https://github.com/apache/airavata
add 3a17b0f Merge branch 'master' of https://github.com/apache/airavata
add 8dac096 Addding cilogon to smaltr gateway
add a039d05 Fixing max poll records in Kafka consumer and ansible fixes
add 594f7b7 Ansible: exclude /dreg/gbrowser from HTTPS
add 205301d Adding topPIC gateway
add a01fae3 Adding topPIC gateway
add 7c6024b Adding topPIC gateway
add de1f1b8 Adding topPIC gateway
add 4bd6725 Adding SSH key to Smaltr gateway
add 81259e7 Adding SSH key to Smaltr gateway
add 1815459 Adding CILogon to TopPIC gateway
add 07af7da Adding SSH key to TopPIC gateway
add 334e72c Ansible: django OS library dependencies
new a2718ab AIRAVATA-3293 Fix join from JobStatusEntity->JobEntity
new 73ca271 Merge branch 'AIRAVATA-3293--Job---JobStatus-entity-mapping-issue' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scigap/production/group_vars/all/vars.yml | 7 +++++++
.../host_vars/dreg/files}/django-ssl-vhost.conf.j2 | 3 ++-
.../scigap/production/host_vars/dreg/vars.yml | 1 +
.../scigap/production/host_vars/smaltr/vars.yml | 8 ++++----
.../host_vars/{pace-gatech => toppic}/vars.yml | 22 +++++++++++-----------
.../scigap/production/host_vars/toppic/vault.yml | 15 +++++++++++++++
.../ansible/inventories/scigap/production/hosts | 1 +
.../ansible/roles/django_setup/tasks/main.yml | 2 ++
.../templates/email-monitor/email-config.yaml.j2 | 1 +
.../helix/impl/workflow/PostWorkflowManager.java | 1 +
.../core/entities/expcatalog/JobStatusEntity.java | 7 +++++--
11 files changed, 50 insertions(+), 18 deletions(-)
copy dev-tools/ansible/{roles/django/templates => inventories/scigap/production/host_vars/dreg/files}/django-ssl-vhost.conf.j2 (96%)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{pace-gatech => toppic}/vars.yml (55%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/toppic/vault.yml
[airavata] 01/02: AIRAVATA-3293 Fix join from
JobStatusEntity->JobEntity
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a2718ab52039ca3bb0122a12ca14e82fca4ae55a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jan 30 15:36:21 2020 -0500
AIRAVATA-3293 Fix join from JobStatusEntity->JobEntity
---
.../registry/core/entities/expcatalog/JobStatusEntity.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
index 53685f7..a91a019 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -59,7 +59,10 @@ public class JobStatusEntity implements Serializable {
private String reason;
@ManyToOne(targetEntity = JobEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
- @JoinColumn(name = "JOB_ID", referencedColumnName = "JOB_ID")
+ @JoinColumns({
+ @JoinColumn(name = "JOB_ID", referencedColumnName = "JOB_ID"),
+ @JoinColumn(name = "TASK_ID", referencedColumnName = "TASK_ID")
+ })
private JobEntity job;
public JobStatusEntity() {
@@ -120,4 +123,4 @@ public class JobStatusEntity implements Serializable {
public void setJob(JobEntity job) {
this.job = job;
}
-}
\ No newline at end of file
+}
[airavata] 02/02: Merge branch
'AIRAVATA-3293--Job---JobStatus-entity-mapping-issue' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 73ca271c35e9472054ded26ca2b68df7a5e407ca
Merge: ad5ce3b a2718ab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jan 30 15:36:29 2020 -0500
Merge branch 'AIRAVATA-3293--Job---JobStatus-entity-mapping-issue' into develop
.../scigap/production/group_vars/all/vars.yml | 7 ++
.../host_vars/dreg/files/django-ssl-vhost.conf.j2 | 88 ++++++++++++++++++++++
.../scigap/production/host_vars/dreg/vars.yml | 1 +
.../scigap/production/host_vars/smaltr/vars.yml | 8 +-
.../scigap/production/host_vars/toppic/vars.yml | 50 ++++++++++++
.../scigap/production/host_vars/toppic/vault.yml | 15 ++++
.../ansible/inventories/scigap/production/hosts | 1 +
.../ansible/roles/django_setup/tasks/main.yml | 2 +
.../templates/email-monitor/email-config.yaml.j2 | 1 +
.../helix/impl/workflow/PostWorkflowManager.java | 1 +
.../core/entities/expcatalog/JobStatusEntity.java | 7 +-
11 files changed, 175 insertions(+), 6 deletions(-)