diff options
| -rw-r--r-- | ick2/actionenvs.py | 8 | ||||
| -rwxr-xr-x | worker_manager | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ick2/actionenvs.py b/ick2/actionenvs.py index 78d4e5a..a21cef2 100644 --- a/ick2/actionenvs.py +++ b/ick2/actionenvs.py @@ -131,13 +131,7 @@ class ActionEnvironment: # pragma: no cover return runner.runcmd(*argvs, cwd=cwd, env=env) def get_env_vars(self): - env = dict(os.environ) - env.update({ - 'LC_ALL': 'C', - 'DEBIAN_FRONTEND': 'noninteractive', - }) - env.update(self._extra_env) - return env + return dict(self._extra_env) class HostEnvironment(ActionEnvironment): diff --git a/worker_manager b/worker_manager index cd2c884..c8f23c7 100755 --- a/worker_manager +++ b/worker_manager @@ -205,6 +205,8 @@ class Worker: af = ick2.ActionFactory(self._systree, self._workspace, reporter) af.set_token(self._api.get_token()) af.set_blob_url_func(self._api.get_blob_upload_url) + af.add_env_var('LC_ALL', 'C') + af.add_env_var('DEBIAN_FRONTEND', 'noninteractive') af.add_env_var('BUILD_NUMBER', str(build_number)) action = af.create_action(step, project_name) exit_code = action.execute(params, step) |