2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9d4cbf2a1c13/ Changeset: 9d4cbf2a1c13 Branch: stable User: natefoo Date: 2013-12-06 22:28:31 Summary: Add missing destination long arg to cli runner's Torque plugin and fix an incorrectly used PBS option in the sample job conf. Affected #: 2 files diff -r 2e8596a621b44cc83511b16ef71c5b31f4469194 -r 9d4cbf2a1c13dd481c10d28a28afb41d23553d18 job_conf.xml.sample_advanced --- a/job_conf.xml.sample_advanced +++ b/job_conf.xml.sample_advanced @@ -52,7 +52,7 @@ <param id="job_plugin">Torque</param><param id="shell_username">foo</param><param id="shell_hostname">foo.example.org</param> - <param id="Job_Execution_Time">24:00:00</param> + <param id="job_Resource_List">walltime=24:00:00,ncpus=4</param></destination><destination id="condor" runner="condor"><!-- With no params, jobs are submitted to the 'vanilla' universe with: diff -r 2e8596a621b44cc83511b16ef71c5b31f4469194 -r 9d4cbf2a1c13dd481c10d28a28afb41d23553d18 lib/galaxy/jobs/runners/cli_job/torque.py --- a/lib/galaxy/jobs/runners/cli_job/torque.py +++ b/lib/galaxy/jobs/runners/cli_job/torque.py @@ -35,7 +35,8 @@ echo $? > %s """ -argmap = { 'Execution_Time' : '-a', +argmap = { 'destination' : '-q', + 'Execution_Time' : '-a', 'Account_Name' : '-A', 'Checkpoint' : '-c', 'Error_Path' : '-e', https://bitbucket.org/galaxy/galaxy-central/commits/72dd51cc1aa0/ Changeset: 72dd51cc1aa0 User: natefoo Date: 2013-12-06 22:28:45 Summary: merge. Affected #: 2 files diff -r 1e361ac55b10fabfa9dce3208eefe50ebf11a95c -r 72dd51cc1aa0ae49c82b4b9714ae82a49ac7ce6b job_conf.xml.sample_advanced --- a/job_conf.xml.sample_advanced +++ b/job_conf.xml.sample_advanced @@ -60,7 +60,7 @@ <param id="job_plugin">Torque</param><param id="shell_username">foo</param><param id="shell_hostname">foo.example.org</param> - <param id="Job_Execution_Time">24:00:00</param> + <param id="job_Resource_List">walltime=24:00:00,ncpus=4</param></destination><destination id="condor" runner="condor"><!-- With no params, jobs are submitted to the 'vanilla' universe with: diff -r 1e361ac55b10fabfa9dce3208eefe50ebf11a95c -r 72dd51cc1aa0ae49c82b4b9714ae82a49ac7ce6b lib/galaxy/jobs/runners/cli_job/torque.py --- a/lib/galaxy/jobs/runners/cli_job/torque.py +++ b/lib/galaxy/jobs/runners/cli_job/torque.py @@ -35,7 +35,8 @@ echo $? > %s """ -argmap = { 'Execution_Time' : '-a', +argmap = { 'destination' : '-q', + 'Execution_Time' : '-a', 'Account_Name' : '-A', 'Checkpoint' : '-c', 'Error_Path' : '-e', Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.