From 53d79d4beb871574eb5f71ed1b0a4c4b059867c8 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 12 Jan 2024 10:38:44 -0800 Subject: [PATCH] [Test] Upgrade clang test from 16 to 17 (#35524) Closes #35524 PiperOrigin-RevId: 597883649 --- .../Dockerfile.template | 2 +- tools/bazelify_tests/dockerimage_current_versions.bzl | 2 +- tools/bazelify_tests/test/portability_tests.bzl | 2 +- tools/dockerfile/test/cxx_clang_16_x64.current_version | 1 - tools/dockerfile/test/cxx_clang_17_x64.current_version | 1 + .../test/{cxx_clang_16_x64 => cxx_clang_17_x64}/Dockerfile | 2 +- tools/run_tests/run_tests.py | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename templates/tools/dockerfile/test/{cxx_clang_16_x64 => cxx_clang_17_x64}/Dockerfile.template (97%) delete mode 100644 tools/dockerfile/test/cxx_clang_16_x64.current_version create mode 100644 tools/dockerfile/test/cxx_clang_17_x64.current_version rename tools/dockerfile/test/{cxx_clang_16_x64 => cxx_clang_17_x64}/Dockerfile (98%) diff --git a/templates/tools/dockerfile/test/cxx_clang_16_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile.template similarity index 97% rename from templates/tools/dockerfile/test/cxx_clang_16_x64/Dockerfile.template rename to templates/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile.template index 0c8d6049e53..e51290c5de4 100644 --- a/templates/tools/dockerfile/test/cxx_clang_16_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM silkeh/clang:16-bullseye + FROM silkeh/clang:17-bullseye RUN apt-get update && apt-get install -y build-essential curl git time wget zip && apt-get clean <%include file="../../git_avoid_dubious_ownership_error.include"/> diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index b3b65e16c1f..fb3120d24f0 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -93,7 +93,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248", "tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:b2e5c47d986312ea0850e2f2e696b45d23ee0aabceea161d31e28559e19ec4a5", "tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:f2019edf9f2afd5042567f11afb1aa78a789fc9acdcce5ee0c14cc11f6830ed7", - "tools/dockerfile/test/cxx_clang_16_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_16_x64@sha256:7559d2743aa03e3247e6c80b412aec06b56a1a3aaa45ac174c07ea94afe62e1d", + "tools/dockerfile/test/cxx_clang_17_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_17_x64@sha256:05c948d794b7b4cf1b3c45106a1332b80808c7cd7f56aeb9a8ece63641f3d41d", "tools/dockerfile/test/cxx_clang_6_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_6_x64@sha256:8e9ddd6c0f3d04c1bf9370cc59712a4e5883f68f307643a9b6dcb2dbd678b579", "tools/dockerfile/test/cxx_debian11_openssl102_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl102_x64@sha256:3bae65e56c756c491dfc4b02cff554ae3c4edd9d366d0d05d27e429b59a01b0f", "tools/dockerfile/test/cxx_debian11_openssl111_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl111_x64@sha256:63f2cd5ae453aa2a850fc59b9ec8e8a865e63d9f99a2b796de65669f3bf21275", diff --git a/tools/bazelify_tests/test/portability_tests.bzl b/tools/bazelify_tests/test/portability_tests.bzl index a366663499b..bfcc4fbde23 100644 --- a/tools/bazelify_tests/test/portability_tests.bzl +++ b/tools/bazelify_tests/test/portability_tests.bzl @@ -60,7 +60,7 @@ def generate_run_tests_portability_tests(name): ["gcc_12_openssl309", "--cmake_configure_extra_args=-DgRPC_SSL_PROVIDER=package", "tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version"], ["gcc_musl", "", "tools/dockerfile/test/cxx_alpine_x64.current_version"], ["clang_6", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_6_x64.current_version"], - ["clang_16", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_16_x64.current_version"], + ["clang_17", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_17_x64.current_version"], ] for compiler_name, args, docker_image_version in compiler_configs: diff --git a/tools/dockerfile/test/cxx_clang_16_x64.current_version b/tools/dockerfile/test/cxx_clang_16_x64.current_version deleted file mode 100644 index f4737b6ccbe..00000000000 --- a/tools/dockerfile/test/cxx_clang_16_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_16_x64:b7ca144315b9ef26226ac3d6e2817ecf523abc07@sha256:7559d2743aa03e3247e6c80b412aec06b56a1a3aaa45ac174c07ea94afe62e1d \ No newline at end of file diff --git a/tools/dockerfile/test/cxx_clang_17_x64.current_version b/tools/dockerfile/test/cxx_clang_17_x64.current_version new file mode 100644 index 00000000000..bf3e6fdb515 --- /dev/null +++ b/tools/dockerfile/test/cxx_clang_17_x64.current_version @@ -0,0 +1 @@ +us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_17_x64:50db090958b219aa79e86c6b842f76269ca89db7@sha256:05c948d794b7b4cf1b3c45106a1332b80808c7cd7f56aeb9a8ece63641f3d41d \ No newline at end of file diff --git a/tools/dockerfile/test/cxx_clang_16_x64/Dockerfile b/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile similarity index 98% rename from tools/dockerfile/test/cxx_clang_16_x64/Dockerfile rename to tools/dockerfile/test/cxx_clang_17_x64/Dockerfile index 1f8f112bac9..3f6b2bdb2d1 100644 --- a/tools/dockerfile/test/cxx_clang_16_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM silkeh/clang:16-bullseye +FROM silkeh/clang:17-bullseye 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 0864ce5ea77..aab76e89615 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -591,8 +591,8 @@ class CLanguage(object): return ("alpine", []) elif compiler == "clang6": return ("clang_6", self._clang_cmake_configure_extra_args()) - elif compiler == "clang16": - return ("clang_16", self._clang_cmake_configure_extra_args()) + elif compiler == "clang17": + return ("clang_17", self._clang_cmake_configure_extra_args()) else: raise Exception("Compiler %s not supported." % compiler)