[CI] Upgrade cmake to 3.16.1 for gcc 7 and 8 docker images (#37571)

gcc 7 and 8 docker images are based on Debian 10 with older cmake than gRPC needs. Since it's not easy to change the base Debian image for these docker images, let's install a newer cmake instead. This is a left-over from https://github.com/grpc/grpc/pull/37547.

Closes #37571

PiperOrigin-RevId: 668560102
pull/37592/head
Esun Kim 3 months ago committed by Copybara-Service
parent ae5dfa13e8
commit 46c59da804
  1. 2
      templates/tools/dockerfile/test/cxx_gcc_7_x64/Dockerfile.template
  2. 2
      templates/tools/dockerfile/test/cxx_gcc_8_x64/Dockerfile.template
  3. 4
      tools/bazelify_tests/dockerimage_current_versions.bzl
  4. 2
      tools/dockerfile/test/cxx_gcc_7_x64.current_version
  5. 8
      tools/dockerfile/test/cxx_gcc_7_x64/Dockerfile
  6. 2
      tools/dockerfile/test/cxx_gcc_8_x64.current_version
  7. 8
      tools/dockerfile/test/cxx_gcc_8_x64/Dockerfile

@ -20,7 +20,7 @@
<%include file="../../git_avoid_dubious_ownership_error.include"/>
<%include file="../../run_tests_python_deps.include"/>
<%include file="../../cxx_test_deps.include"/>
<%include file="../../cmake.include"/>
<%include file="../../cmake_from_install_script.include"/>
<%include file="../../ccache_old.include"/>
<%include file="../../run_tests_addons.include"/>

@ -20,7 +20,7 @@
<%include file="../../git_avoid_dubious_ownership_error.include"/>
<%include file="../../run_tests_python_deps.include"/>
<%include file="../../cxx_test_deps.include"/>
<%include file="../../cmake.include"/>
<%include file="../../cmake_from_install_script.include"/>
<%include file="../../ccache_old.include"/>
<%include file="../../run_tests_addons.include"/>

@ -102,8 +102,8 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/cxx_debian11_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_x86@sha256:3f505ad99e52a4b3337fedb413e883bc8e5c1d9c089299c34002b89e01254d3b",
"tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian12_openssl309_x64@sha256:f75bb715c4f9464526f9affb410f7965a0b8894516d7d98cd89a4e165ae065b7",
"tools/dockerfile/test/cxx_gcc_12_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_12_x64@sha256:bbdfe66f27b964f9bfd526646b94a19d904fea52bdb244f32fd4355cc8c4551f",
"tools/dockerfile/test/cxx_gcc_7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_7_x64@sha256:fb1924844078f48557d6ab57eac1482f80a3cc216406efc3aeaecab671c886d5",
"tools/dockerfile/test/cxx_gcc_8_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_8_x64@sha256:989ceb4324a6240940d7185ccb581f8eff656d2c8c36d15fa14e3f57f294c913",
"tools/dockerfile/test/cxx_gcc_7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_7_x64@sha256:e1925d7f08a7f167c6aab2f8284a3f13b7f3830ba38876e6de1dee2ffd3c7d2f",
"tools/dockerfile/test/cxx_gcc_8_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_8_x64@sha256:19511527fc3da78344a7ece5f1cf8ba06d928202ba5b3ca039dccb86d1a417fc",
"tools/dockerfile/test/php73_zts_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php73_zts_debian11_x64@sha256:186a96566a9c11adfb198309431086bdb02421121c262a2bf0166e3e9b21fb37",
"tools/dockerfile/test/php7_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_arm64@sha256:7ee21f253a2ddd255f4f6779cd19818eec6524e78b0bf0a7765339e4aa7347c3",
"tools/dockerfile/test/php7_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_x64@sha256:34b02fd66832ebf49601bef95632753e6710a75755401c21332d50056ccd52d2",

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_7_x64:8bc7b7f679857e741188d07a7db7acecf3a9168f@sha256:fb1924844078f48557d6ab57eac1482f80a3cc216406efc3aeaecab671c886d5
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_7_x64:f8356ab2c9fa661f523b0c27c2831404b0f504f3@sha256:e1925d7f08a7f167c6aab2f8284a3f13b7f3830ba38876e6de1dee2ffd3c7d2f

@ -52,10 +52,10 @@ RUN python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-clien
RUN python3 -m pip install twisted
#=================
# Install cmake
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
RUN apt-get update && apt-get install -y cmake && apt-get clean
# Install cmake using the install script.
RUN curl -sSL -o cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-Linux-x86_64.sh \
&& sh cmake-linux.sh -- --skip-license --prefix=/usr \
&& rm cmake-linux.sh
#=================
# Install ccache (use slighly older release of ccache that works older compilers and cmake)

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_8_x64:b28a69d75b25581e20dafd4356bca3e0d26e3d0e@sha256:989ceb4324a6240940d7185ccb581f8eff656d2c8c36d15fa14e3f57f294c913
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_gcc_8_x64:f9d7562b232a1c2305a46c2333d5a82e2a13fa60@sha256:19511527fc3da78344a7ece5f1cf8ba06d928202ba5b3ca039dccb86d1a417fc

@ -52,10 +52,10 @@ RUN python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-clien
RUN python3 -m pip install twisted
#=================
# Install cmake
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
RUN apt-get update && apt-get install -y cmake && apt-get clean
# Install cmake using the install script.
RUN curl -sSL -o cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-Linux-x86_64.sh \
&& sh cmake-linux.sh -- --skip-license --prefix=/usr \
&& rm cmake-linux.sh
#=================
# Install ccache (use slighly older release of ccache that works older compilers and cmake)

Loading…
Cancel
Save