From cea11394c26e76c60a400d5e1fa6adbe205ba458 Mon Sep 17 00:00:00 2001
From: Stanley Cheung <stanleycheung@google.com>
Date: Thu, 15 Oct 2015 14:52:34 -0700
Subject: [PATCH] bring env variable to build_interop_image script
---
tools/run_tests/run_interop_tests.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 40e1b6e0cc..a4b6a747ed 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -475,15 +475,16 @@ def server_jobspec(language, docker_image):
def build_interop_image_jobspec(language, tag=None):
"""Creates jobspec for building interop docker image for a language"""
+ environ = language.global_env()
if not tag:
tag = 'grpc_interop_%s:%s' % (language.safename, uuid.uuid4())
- env = {'INTEROP_IMAGE': tag,
- 'BASE_NAME': 'grpc_interop_%s' % language.safename}
+ environ['INTEROP_IMAGE'] = tag
+ environ['BASE_NAME'] = 'grpc_interop_%s' % language.safename
if not args.travis:
- env['TTY_FLAG'] = '-t'
+ environ['TTY_FLAG'] = '-t'
build_job = jobset.JobSpec(
cmdline=['tools/jenkins/build_interop_image.sh'],
- environ=env,
+ environ=environ,
shortname="build_docker_%s" % (language),
timeout_seconds=30*60)
build_job.tag = tag
--
GitLab