Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d14eb9e63c222345cff111b8fe888a74a968d4bc https://github.com/galaxyproject/galaxy/commit/d14eb9e63c222345cff111b8fe888... Author: John Chilton jmchilton@gmail.com Date: 2017-06-06 (Tue, 06 Jun 2017)

Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py A test/unit/jobs/conditional_runners_job_conf.xml M test/unit/jobs/test_job_configuration.py

Log Message: ----------- Add the ability to control job conf plugin loading from environment variables.

All job configuration parameters can be set using environment variables but currently the actual loading of the plugin cannot. This is problematic for setting up single job confs for multiple environemnts (like done with docker-galaxy-stable) when using plugins that may hang waiting for resources (such as Kubernetes for the K8 runner or a MQ for Pulsar for instance) or may require library dependencies not be setup in every environment the job configuration is deployed in.

xref https://github.com/bgruening/docker-galaxy-stable/pull/328

Rebased with advice from @bgruening.

Commit: ee4826fbc4aeb09bcf01e501759f9774e61244b1 https://github.com/galaxyproject/galaxy/commit/ee4826fbc4aeb09bcf01e501759f9... Author: Björn Grüning bjoern@gruenings.eu Date: 2017-06-06 (Tue, 06 Jun 2017)

Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py A test/unit/jobs/conditional_runners_job_conf.xml M test/unit/jobs/test_job_configuration.py

Log Message: ----------- Merge pull request #4154 from jmchilton/dynamic_disable_runners

Add the ability to control job conf plugin loading from environment variables.

Compare: https://github.com/galaxyproject/galaxy/compare/ae76200b08b6...ee4826fbc4ae