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 2022/03/21 13:48:15 UTC

[airavata] branch develop updated (75ba6c2 -> 1f230a3)

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 75ba6c2  Merge branch 'master' into develop
     add b89f62b  Merge pull request #276 from apache/AIRAVATA-3549
     add 34d6536  Ansible: Updating Helix download URLs
     new 1f230a3  Merge branch 'master' into develop

The 1 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:
 dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml  | 2 +-
 .../ansible/inventories/scigap/production/group_vars/all/vars.yml     | 2 +-
 dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml  | 2 +-
 dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml  | 4 ++--
 dev-tools/ansible/inventories/standalone/group_vars/helix/vars.yml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

[airavata] 01/01: Merge branch 'master' 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 1f230a374066f1ebcff4a155decabb514059210e
Merge: 75ba6c2 34d6536
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Mar 21 09:48:00 2022 -0400

    Merge branch 'master' into develop

 dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml  | 2 +-
 .../ansible/inventories/scigap/production/group_vars/all/vars.yml     | 2 +-
 dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml  | 2 +-
 dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml  | 4 ++--
 dev-tools/ansible/inventories/standalone/group_vars/helix/vars.yml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --cc dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index 53d46bc,bce1187..ac50e8a
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@@ -148,10 -148,10 +148,10 @@@ keycloak_vhost_servername: "iamdev.scig
  
  # Helix
  helix_version: 0.7.1
- helix_url: http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
+ helix_url: https://archive.apache.org/dist/helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
  helix_dir: "{{ deployment_dir }}/airavata-helix"
  helix_cluster_name: "AiravataDevCluster"
 -snapshot_version: "0.20-SNAPSHOT"
 +snapshot_version: "0.21-SNAPSHOT"
  helix_pre_wm_load_balance_clusters: "false"
  helix_post_wm_load_balance_clusters: "false"
  
diff --cc dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 5f59e5d,7e25e98..ddbf285
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@@ -140,10 -140,10 +140,10 @@@ letsencrypt_email: "circ-iu-group@iu.ed
  
  # Helix
  helix_version: 0.7.1
- helix_url: http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
+ helix_url: https://archive.apache.org/dist/helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
  helix_dir: "{{ deployment_dir }}/airavata-helix"
  helix_cluster_name: "AiravataDemoCluster"
 -snapshot_version: "0.20-SNAPSHOT"
 +snapshot_version: "0.21-SNAPSHOT"
  helix_controller_name: "helixcontroller"
  helix_participant_name: "helixparticipant"
  helix_pre_wm_name: "prewm"