From 55d7631a997bfd043ac78e3834ad00665d60c655 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Fri, 21 Jan 2022 14:47:04 -0800
Subject: [PATCH] Bump clang 12 to 13 (#28639)

---
 .../Dockerfile.template                                     | 2 +-
 .../test/{cxx_clang_12_x64 => cxx_clang_13_x64}/Dockerfile  | 2 +-
 tools/run_tests/run_tests.py                                | 6 +++---
 tools/run_tests/run_tests_matrix.py                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename templates/tools/dockerfile/test/{cxx_clang_12_x64 => cxx_clang_13_x64}/Dockerfile.template (97%)
 rename tools/dockerfile/test/{cxx_clang_12_x64 => cxx_clang_13_x64}/Dockerfile (98%)

diff --git a/templates/tools/dockerfile/test/cxx_clang_12_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_clang_13_x64/Dockerfile.template
similarity index 97%
rename from templates/tools/dockerfile/test/cxx_clang_12_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/cxx_clang_13_x64/Dockerfile.template
index 6d96854bec0..d6f34ca38d6 100644
--- a/templates/tools/dockerfile/test/cxx_clang_12_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_clang_13_x64/Dockerfile.template
@@ -14,7 +14,7 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
-  FROM silkeh/clang:12
+  FROM silkeh/clang:13
   
   RUN apt-get update && apt-get install -y build-essential curl git time wget zip && apt-get clean
   <%include file="../../run_tests_python_deps.include"/>
diff --git a/tools/dockerfile/test/cxx_clang_12_x64/Dockerfile b/tools/dockerfile/test/cxx_clang_13_x64/Dockerfile
similarity index 98%
rename from tools/dockerfile/test/cxx_clang_12_x64/Dockerfile
rename to tools/dockerfile/test/cxx_clang_13_x64/Dockerfile
index 473b5536515..86f7add6856 100644
--- a/tools/dockerfile/test/cxx_clang_12_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_clang_13_x64/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM silkeh/clang:12
+FROM silkeh/clang:13
 
 RUN apt-get update && apt-get install -y build-essential curl git time wget zip && apt-get clean
 #====================
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index a8c6437689d..4e901d11000 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -474,8 +474,8 @@ class CLanguage(object):
             return ('alpine', [])
         elif compiler == 'clang4':
             return ('clang_4', self._clang_cmake_configure_extra_args())
-        elif compiler == 'clang12':
-            return ('clang_12', self._clang_cmake_configure_extra_args())
+        elif compiler == 'clang13':
+            return ('clang_13', self._clang_cmake_configure_extra_args())
         else:
             raise Exception('Compiler %s not supported.' % compiler)
 
@@ -1388,7 +1388,7 @@ argp.add_argument(
         'gcc11',
         'gcc_musl',
         'clang4',
-        'clang12',
+        'clang13',
         'python2.7',
         'python3.5',
         'python3.6',
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 7c55f66cb17..be9afb54c6c 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -267,7 +267,7 @@ def _create_portability_test_jobs(extra_args=[],
     # portability C and C++ on x64
     for compiler in [
             'gcc4.9', 'gcc8.3', 'gcc8.3_openssl102', 'gcc11', 'gcc_musl',
-            'clang4', 'clang12'
+            'clang4', 'clang13'
     ]:
         test_jobs += _generate_jobs(languages=['c', 'c++'],
                                     configs=['dbg'],