From 367d41d304e2c69bfa1182c67f15b51551e96f8c Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Oct 2015 13:00:22 -0700
Subject: [PATCH] Trying harder to avoid Jenkins killing us
---
tools/run_tests/run_tests.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 2934b5f70f..8f69e4a18a 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -710,14 +710,18 @@ def _start_port_server(port_server_port):
os.close(fd)
print 'starting port_server, with log file %s' % logfile
args = [sys.executable, 'tools/run_tests/port_server.py', '-p', '%d' % port_server_port, '-l', logfile]
+ env = dict(os.environ)
+ env['BUILD_ID'] = 'pleaseDontKillMeJenkins'
if platform.system() == 'Windows':
port_server = subprocess.Popen(
- args,
- creationflags = 0x00000008, # detached process
- close_fds=True)
+ args,
+ env=env,
+ creationflags = 0x00000008, # detached process
+ close_fds=True)
else:
port_server = subprocess.Popen(
args,
+ env=env,
preexec_fn=os.setsid,
close_fds=True)
time.sleep(1)
--
GitLab