From 9beeb79a6d631acf071ac229516a384d9d0f23a7 Mon Sep 17 00:00:00 2001 From: Nuwan Goonasekera <2070605+nuwang@users.noreply.github.com> Date: Sun, 9 Jun 2024 17:31:59 +0530 Subject: [PATCH 1/2] Make sure tpv shared db is loaded first --- env/common/templates/galaxy/config/job_conf.yml.j2 | 2 +- env/main/templates/galaxy/config/job_conf_vgp.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/env/common/templates/galaxy/config/job_conf.yml.j2 b/env/common/templates/galaxy/config/job_conf.yml.j2 index 662e53c2..bf2160f8 100644 --- a/env/common/templates/galaxy/config/job_conf.yml.j2 +++ b/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://gxy.io/tpv/db.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" diff --git a/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 b/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 index 6c939209..265a3207 100644 --- a/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 +++ b/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://gxy.io/tpv/db.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" From 975d451a2ace68a6c0e3dad3ac76851a6840c2fc Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Mon, 10 Jun 2024 16:00:11 +0200 Subject: [PATCH 2/2] Pin to commit of tpv-shared-database main branch Co-authored-by: Nuwan Goonasekera <2070605+nuwang@users.noreply.github.com> --- env/common/templates/galaxy/config/job_conf.yml.j2 | 2 +- env/main/templates/galaxy/config/job_conf_vgp.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/env/common/templates/galaxy/config/job_conf.yml.j2 b/env/common/templates/galaxy/config/job_conf.yml.j2 index bf2160f8..9639ed71 100644 --- a/env/common/templates/galaxy/config/job_conf.yml.j2 +++ b/env/common/templates/galaxy/config/job_conf.yml.j2 @@ -65,7 +65,7 @@ execution: function: map_tool_to_destination rules_module: tpv.rules tpv_config_files: - - "https://gxy.io/tpv/db.yml" + - "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" diff --git a/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 b/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 index 265a3207..274f256c 100644 --- a/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 +++ b/env/main/templates/galaxy/config/job_conf_vgp.yml.j2 @@ -73,7 +73,7 @@ execution: function: map_tool_to_destination rules_module: tpv.rules tpv_config_files: - - "https://gxy.io/tpv/db.yml" + - "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/e2277c4e9aa8044342832f08d9fc06ebf7e8287c/tools.yml" - "{{ tpv_config_dir }}/defaults_vgp.yaml" - "{{ tpv_config_dir }}/environments_vgp.yaml" - "{{ tpv_config_dir }}/tools_vgp.yaml"