Make sure Test and Main use EL7-compatible Node for GxIT proxy, update Test

natefoo · natefoo · commit 0fabd8d45ce4 · 2024-06-06T11:39:03.000-05:00
diff --git a/env/main/group_vars/cvmfsstratum0servers.yml b/env/main/group_vars/cvmfsstratum0servers.yml
@@ -26,6 +26,9 @@ miniconda_conda_environments:
     packages:
       - pango
 
+# Stratum 0 is EL9 but Galaxy servers are still EL7 for now, and venv node is used to run the gx-it-proxy
+galaxy_node_version_max: 16.19.1
+
 # also set in galaxyservers, but not set in all I think because it's invalid for pulsar contexts
 galaxy_server_dir: /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy
 galaxy_config_dir: null
diff --git a/env/test/files/galaxy/galaxy_version.yml b/env/test/files/galaxy/galaxy_version.yml
@@ -1,3 +1,3 @@
 ---
 galaxy_version: 24.1.rc1
-galaxy_commit: a9c1300fd44b9545efbc258701a2727fddca3cd7
+galaxy_commit: c681c0c29aaeac790e2486bf465a8babfaa1bcb9
diff --git a/env/test/group_vars/cvmfsstratum0servers.yml b/env/test/group_vars/cvmfsstratum0servers.yml
@@ -28,6 +28,9 @@ miniconda_conda_environments:
 
 xdg_cache_home: /srv/galaxy-test-cache/cache
 
+# Stratum 0 is EL9 but Galaxy servers are still EL7 for now, and venv node is used to run the gx-it-proxy
+galaxy_node_version_max: 16.19.1
+
 # also set in galaxyservers, but not set in all I think because it's invalid for pulsar contexts
 galaxy_server_dir: /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy
 galaxy_config_dir: null
