Merge pull request #389 from nuwang/main

Make sure tpv shared db is loaded first

Author: mvdbeek

env/common/templates/galaxy/config/job_conf.yml.j2

@@ -65,10 +65,10 @@ execution:
       function: map_tool_to_destination
       rules_module: tpv.rules
       tpv_config_files:
+        - "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/e2277c4e9aa8044342832f08d9fc06ebf7e8287c/tools.yml"
         - "{{ tpv_config_dir }}/defaults.yaml"
         - "{{ tpv_config_dir }}/environments.yaml"
         - "{{ tpv_config_dir }}/tools_pre_shared.yaml"
-        - "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/main/tools.yml"
         - "{{ tpv_config_dir }}/tools.yaml"
         - "{{ tpv_config_dir }}/users.yaml"
         - "{{ tpv_config_dir }}/roles.yaml"

env/main/templates/galaxy/config/job_conf_vgp.yml.j2

@@ -73,9 +73,9 @@ execution:
       function: map_tool_to_destination
       rules_module: tpv.rules
       tpv_config_files:
+        - "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/e2277c4e9aa8044342832f08d9fc06ebf7e8287c/tools.yml"
         - "{{ tpv_config_dir }}/defaults_vgp.yaml"
         - "{{ tpv_config_dir }}/environments_vgp.yaml"
-        - "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/main/tools.yml"
         - "{{ tpv_config_dir }}/tools_vgp.yaml"
         #- "{{ tpv_config_dir }}/users_vgp.yaml"
         - "{{ tpv_config_dir }}/roles_vgp.yaml"