Merge branch 'master' into 2955-fail-orphan-jobs

[arvados.git] / services / api / script / crunch-dispatch.rb

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 87acb651a4347c2900689c296eb20b108f35e213..ee8076b305fad984aee6bdde12ef5cfe803e14d4 100755 (executable)
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -140,23 +140,13 @@ class Dispatcher
       end
 
       if Server::Application.config.crunch_job_user
-        cmd_args.unshift("sudo", "-E", "-u", Server::Application.config.crunch_job_user)
-      end
-
-      cmd_args << "HOME=/dev/null"
-      cmd_args << "ARVADOS_API_HOST=#{ENV['ARVADOS_API_HOST']}"
-      cmd_args << "ARVADOS_API_HOST_INSECURE=#{ENV['ARVADOS_API_HOST_INSECURE']}" if ENV['ARVADOS_API_HOST_INSECURE']
-
-      ENV.each do |k, v|
-        cmd_args << "#{k}=#{v}" if k.starts_with? "CRUNCH_"
-      end
-
-      if $trollopts.use_env
-        cmd_args << "PATH=#{ENV['PATH']}"
-        cmd_args << "PYTHONPATH=#{ENV['PYTHONPATH']}"
-        cmd_args << "PERLLIB=#{ENV['PERLLIB']}"
-        cmd_args << "RUBYLIB=#{ENV['RUBYLIB']}"
-        cmd_args << "GEM_PATH=#{ENV['GEM_PATH']}"
+        cmd_args.unshift("sudo", "-E", "-u",
+                         Server::Application.config.crunch_job_user,
+                         "PATH=#{ENV['PATH']}",
+                         "PERLLIB=#{ENV['PERLLIB']}",
+                         "PYTHONPATH=#{ENV['PYTHONPATH']}",
+                         "RUBYLIB=#{ENV['RUBYLIB']}",
+                         "GEM_PATH=#{ENV['GEM_PATH']}")
       end
 
       job_auth = ApiClientAuthorization.