Merge pull request #59 from ARTbio/release_24.1

Update to Galaxy release_24.1
ARTbio · Oct 9, 2024 · 2a59820 · 2a59820
2 parents 009c952 + 567608f
commit 2a59820
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile.galaxyxpand b/Dockerfile.galaxyxpand
@@ -89,8 +89,9 @@ RUN echo "remote_tmp = /setup/.ansible/tmp" >> ansible.cfg && \
     service postgresql start && \
     sed -i '/slurm-wlm/d' playbook.yml && sed -i '/slurm-drmaa-dev/d' playbook.yml && \
     ansible-galaxy install -r requirements.yml -p roles -f && \
-    head -n -4 roles/galaxyproject.galaxy/handlers/main.yml > tmp.txt &&\
-    mv tmp.txt roles/galaxyproject.galaxy/handlers/main.yml &&\
+    # following was commented with the release_24.1
+    # head -n -4 roles/galaxyproject.galaxy/handlers/main.yml > tmp.txt &&\
+    # mv tmp.txt roles/galaxyproject.galaxy/handlers/main.yml &&\
     ansible-playbook -i environments/Docker/hosts playbook.yml
 
 ONBUILD  WORKDIR  /setup

diff --git a/environments/000_cross_env_vars b/environments/000_cross_env_vars
@@ -15,7 +15,7 @@ nginx_conf_user: "www-data galaxy"
 galaxy_manage_systemd: true
 
 # Galaxy common to all hosts
-galaxy_commit_id: release_24.0
+galaxy_commit_id: release_24.1
 galaxy_user_name: galaxy
 galaxy_db_name: galaxy
 galaxy_config_perms: 0664

diff --git a/environments/ARTbio/group_vars/all/galaxy b/environments/ARTbio/group_vars/all/galaxy
@@ -70,7 +70,7 @@ galaxy_config:
 # Welcome html page variables
 _artbio_info: |
   <h4>
-  <strong> ARTbio server recently upgraded to release 24.0 (2024-06-29)
+  <strong> ARTbio server recently upgraded to release 24.1 (2024-07-17)
   <br>
   Please report any unusual bugs</strong>
   </h4>

diff --git a/environments/Conect/group_vars/all/galaxy b/environments/Conect/group_vars/all/galaxy
@@ -75,7 +75,7 @@ galaxy_config:
 _conect_info: |
   <strong>Galaxy software was upgraded to
   <br>
-  release_24.0 (2024-06-17)</strong>
+  release_24.1 (2024-07-17)</strong>
 conect_info: "{{ _conect_info | indent(width=10, first=True) }}"
 
 # deploy galaxy configuration files

diff --git a/environments/Mississippi/group_vars/all/galaxy b/environments/Mississippi/group_vars/all/galaxy
@@ -70,7 +70,7 @@ galaxy_config:
 
 # Welcome html page variables
 _Mississippi_info: |
-  <strong> On 2024-06-23, Mississippi was upgraded to release 24.0
+  <strong> On 2024-07-17, Mississippi was upgraded to release 24.1
   <br>
   Please report any unusual bugs with tools or workflows</strong>
 Mississippi_info: "{{ _Mississippi_info | indent(width=12, first=True) }}"

diff --git a/environments/dev_gce/group_vars/all/galaxy b/environments/dev_gce/group_vars/all/galaxy
@@ -2,7 +2,7 @@
 # Galaxy
 
 # development branch
-galaxy_commit_id: release_24.0
+galaxy_commit_id: release_24.1
 
 galaxy_config:
   galaxy: