From 48b194f737978f04b8b51ee9def2bad4c9e89bfe Mon Sep 17 00:00:00 2001
From: yifeizhuang <yifeizhuang@gmail.com>
Date: Wed, 18 Aug 2021 08:22:11 -0700
Subject: [PATCH] release v1.40.0: build gcr images for release, fix python2.7
 (#27045)

---
 tools/interop_matrix/client_matrix.py        | 1 +
 tools/interop_matrix/create_matrix_images.py | 4 ++--
 tools/run_tests/python_utils/jobset.py       | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index 5589b97ad49..7a398ab19f0 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -264,6 +264,7 @@ LANG_RELEASE_MATRIX = {
             ('v1.37.1', ReleaseInfo()),
             ('v1.38.1', ReleaseInfo()),
             ('v1.39.0', ReleaseInfo()),
+            ('v1.40.0', ReleaseInfo()),
         ]),
     'python':
         OrderedDict([
diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py
index b413ab4c2c7..bda9d9bf799 100755
--- a/tools/interop_matrix/create_matrix_images.py
+++ b/tools/interop_matrix/create_matrix_images.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 # Copyright 2017 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -339,7 +339,7 @@ def checkout_grpc_stack(lang, release):
                    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:
+    with open(os.path.join(stack_base, 'commit_log'), 'wb') as f:
         f.write(commit_log)
     return stack_base
 
diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py
index 60ce0e06646..a8bbf656ccc 100755
--- a/tools/run_tests/python_utils/jobset.py
+++ b/tools/run_tests/python_utils/jobset.py
@@ -136,9 +136,9 @@ def message(tag, msg, explanatory_text=None, do_newline=False):
                 sys.stdout.write(
                     '%s%s%s\x1b[%d;%dm%s\x1b[0m: %s%s' %
                     (_BEGINNING_OF_LINE, _CLEAR_LINE, '\n%s' %
-                     explanatory_text.decode('utf8') if explanatory_text
-                     is not None else '', _COLORS[_TAG_COLOR[tag]][1],
-                     _COLORS[_TAG_COLOR[tag]][0], tag, msg, '\n'
+                     explanatory_text if explanatory_text is not None else '',
+                     _COLORS[_TAG_COLOR[tag]][1], _COLORS[_TAG_COLOR[tag]][0],
+                     tag, msg, '\n'
                      if do_newline or explanatory_text is not None else ''))
             sys.stdout.flush()
             return