From cf20b1763ecb7c9778a96a6afedc15cb5c444cb8 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Fri, 6 Mar 2020 16:03:52 -0800
Subject: [PATCH 1/2] run re-initialize submodules after checking out a tag in
interop matrix image builder
---
tools/interop_matrix/create_matrix_images.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py
index 91a991d534f..9bc457d5b5d 100755
--- a/tools/interop_matrix/create_matrix_images.py
+++ b/tools/interop_matrix/create_matrix_images.py
@@ -325,6 +325,18 @@ def checkout_grpc_stack(lang, release):
'%s: %s' % (str(output), commit_log),
do_newline=True)
+ # git submodule update
+ jobset.message('START',
+ 'git submodule update --init at %s from %s' % (release, stack_base),
+ do_newline=True)
+ subprocess.check_call(['git', 'submodule', 'update', '--init'],
+ cwd=stack_base,
+ stderr=subprocess.STDOUT)
+ jobset.message('SUCCESS',
+ 'git submodule update --init',
+ '%s: %s' % (str(output), commit_log),
+ do_newline=True)
+
# Write git log to commit_log so it can be packaged with the docker image.
with open(os.path.join(stack_base, 'commit_log'), 'w') as f:
f.write(commit_log)
From c4dd07aa7527f0904532d459321ea5b6c301d103 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Mon, 9 Mar 2020 12:13:32 -0700
Subject: [PATCH 2/2] yapf code
---
tools/interop_matrix/create_matrix_images.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py
index 9bc457d5b5d..b413ab4c2c7 100755
--- a/tools/interop_matrix/create_matrix_images.py
+++ b/tools/interop_matrix/create_matrix_images.py
@@ -327,7 +327,8 @@ def checkout_grpc_stack(lang, release):
# git submodule update
jobset.message('START',
- 'git submodule update --init at %s from %s' % (release, stack_base),
+ 'git submodule update --init at %s from %s' %
+ (release, stack_base),
do_newline=True)
subprocess.check_call(['git', 'submodule', 'update', '--init'],
cwd=stack_base,