[Test] Upgrade clang test from 16 to 17 (#35524)

Closes #35524

PiperOrigin-RevId: 597883649
pull/35543/head
Esun Kim 1 year ago committed by Copybara-Service
parent a6823b6e97
commit 53d79d4beb
  1. 2
      templates/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile.template
  2. 2
      tools/bazelify_tests/dockerimage_current_versions.bzl
  3. 2
      tools/bazelify_tests/test/portability_tests.bzl
  4. 1
      tools/dockerfile/test/cxx_clang_16_x64.current_version
  5. 1
      tools/dockerfile/test/cxx_clang_17_x64.current_version
  6. 2
      tools/dockerfile/test/cxx_clang_17_x64/Dockerfile
  7. 4
      tools/run_tests/run_tests.py

@ -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"/>

@ -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",

@ -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:

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_16_x64:b7ca144315b9ef26226ac3d6e2817ecf523abc07@sha256:7559d2743aa03e3247e6c80b412aec06b56a1a3aaa45ac174c07ea94afe62e1d

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_17_x64:50db090958b219aa79e86c6b842f76269ca89db7@sha256:05c948d794b7b4cf1b3c45106a1332b80808c7cd7f56aeb9a8ece63641f3d41d

@ -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
#=================

@ -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)

Loading…
Cancel
Save