[CI] Upgraded all `Debian 10` based images to `Debian 11` (#37547)

Debian 10 is long gone and it has too old cmake to get new Abseil.

Closes #37547

PiperOrigin-RevId: 666844603
pull/37569/head
Esun Kim 7 months ago committed by Copybara-Service
parent 158976a963
commit c708472df6
  1. 10
      test/distrib/cpp/run_distrib_test_cmake_aarch64_cross.sh
  2. 8
      tools/bazelify_tests/dockerimage_current_versions.bzl
  3. 26
      tools/bazelify_tests/test/BUILD
  4. 1
      tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version
  5. 1
      tools/dockerfile/distribtest/cpp_debian10_x64.current_version
  6. 1
      tools/dockerfile/distribtest/cpp_debian11_aarch64_cross_x64.current_version
  7. 5
      tools/dockerfile/distribtest/cpp_debian11_aarch64_cross_x64/Dockerfile
  8. 1
      tools/dockerfile/distribtest/cpp_debian11_x64.current_version
  9. 2
      tools/dockerfile/distribtest/cpp_debian11_x64/Dockerfile
  10. 1
      tools/dockerfile/distribtest/csharp_debian10_x64.current_version
  11. 1
      tools/dockerfile/distribtest/csharp_debian11_x64.current_version
  12. 4
      tools/dockerfile/distribtest/csharp_debian11_x64/Dockerfile
  13. 1
      tools/dockerfile/distribtest/php7_debian10_x64.current_version
  14. 1
      tools/dockerfile/distribtest/php7_debian11_x64.current_version
  15. 2
      tools/dockerfile/distribtest/php7_debian11_x64/Dockerfile
  16. 20
      tools/run_tests/artifacts/distribtest_targets.py

@ -20,12 +20,6 @@ cd "$(dirname "$0")/../../.."
# Install openssl (to use instead of boringssl)
apt-get update && apt-get install -y libssl-dev
# Install CMake 3.16
apt-get update && apt-get install -y wget
wget -q -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
# Use externally provided env to determine build parallelism, otherwise use default.
GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS=${GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS:-4}
@ -48,8 +42,8 @@ cat > /tmp/toolchain.cmake <<'EOT'
SET(CMAKE_SYSTEM_NAME Linux)
SET(CMAKE_SYSTEM_PROCESSOR aarch64)
set(CMAKE_STAGING_PREFIX /tmp/stage)
set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc-8)
set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-8)
set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc-10)
set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-10)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

@ -27,15 +27,15 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"third_party/rake-compiler-dock/rake_x86-mingw32.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rake_x86-mingw32@sha256:3611deccc6dc127adb2c6e5cf940f6631b0f17ea27e9966894ffa2e6b9c8dabc",
"third_party/rake-compiler-dock/rake_x86_64-darwin.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rake_x86_64-darwin@sha256:ba8e38140f69ae8febe01f8b168782ec1f15cd2e59dd61719fd1176404138062",
"third_party/rake-compiler-dock/rake_x86_64-linux.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rake_x86_64-linux@sha256:64d4f1c9c23d5d26f38df101128e466940081183cbeac2ab3fa86f4d5a9d0a97",
"tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_aarch64_cross_x64@sha256:32588bf15195f201ffd91ba279bc425b5b787712b21dcb41bb390341958c3cdb",
"tools/dockerfile/distribtest/cpp_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_x64@sha256:cf1c89aa534084e0c8a6c90bfec42b66e48be16ae15ee97e2a1e7c7187756f33",
"tools/dockerfile/distribtest/cpp_debian11_aarch64_cross_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian11_aarch64_cross_x64@sha256:97ff55660fb93f4b31c029f2935bd18edf82e55d4df65376e55ed97b228a49c7",
"tools/dockerfile/distribtest/cpp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian11_x64@sha256:beb3a8bedc067f4c8f54c8efe31f3d7149056c39c9751aaa395c788dd54e0a7e",
"tools/dockerfile/distribtest/csharp_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_alpine_x64@sha256:65083a6c7b1e6f18374ac6218a924409dfc6ab526ec627b9a33d81e21c93e025",
"tools/dockerfile/distribtest/csharp_centos7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_centos7_x64@sha256:ec715dd5fbd621789e7598c8d4ac346a7b4037b0cc83fbb29990dc8e4c1f1a13",
"tools/dockerfile/distribtest/csharp_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian10_x64@sha256:a06871dfb9ce26880a38af75961f753123b7f9448947b40f5160ba1a4566ec4d",
"tools/dockerfile/distribtest/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:56db96cbb341ee2336a492b86f479814f8e819fd73499dca1f7c62e52c5c953a",
"tools/dockerfile/distribtest/csharp_dotnet31_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_dotnet31_x64@sha256:b7afb4aa2f4ac65df757eb42fa78ee105fdde856feda0a9deeb5afedf87a5410",
"tools/dockerfile/distribtest/csharp_dotnet5_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_dotnet5_x64@sha256:004e02902825b54c7f0d60eaed0819acf6f10c24853bf8f793001114e9969abd",
"tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64@sha256:a439f2ccbc666f231e511a8e58eb7f66a3de4820a4d5aded1e62275cf8ac49f0",
"tools/dockerfile/distribtest/php7_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian10_x64@sha256:7791ae6f933d3697e3ff25b238edab52c167e088e35e7435663fa0ba1383587d",
"tools/dockerfile/distribtest/php7_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_x64@sha256:e74902d75c5d0afdfb29f2f6200ef3e1b406cf4975c6a3a9a058ab101b004c7e",
"tools/dockerfile/distribtest/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:d7232ef55c81d125b66899b908668156638cd2cfc5b119083eceacb6018da7e4",
"tools/dockerfile/distribtest/python_arch_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_arch_x64@sha256:2c1adadeb010e107132cf5137f32a2d18727796631245b110cc74f69c07502e1",
"tools/dockerfile/distribtest/python_bullseye_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_bullseye_x64@sha256:80553398f0c59c1dc186052f4f2deaf18fea582f6d1d166eec6ea298639031fb",

@ -155,49 +155,49 @@ grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_as_submodule_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_as_submodule.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_as_externalproject_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_fetchcontent_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_module_install_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_module_install.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_pkgconfig_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_x64.current_version",
)
grpc_run_cpp_distribtest_test(
name = "cpp_distribtest_cmake_aarch64_cross_linux",
size = "enormous",
args = ["test/distrib/cpp/run_distrib_test_cmake_aarch64_cross.sh"],
docker_image_version = "tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/cpp_debian11_aarch64_cross_x64.current_version",
)
test_suite(
@ -311,13 +311,13 @@ grpc_build_artifact_task(
# C# distribtests
grpc_run_distribtest_test(
name = "distribtest_csharp_linux_x64_debian10",
name = "distribtest_csharp_linux_x64_debian11",
# depend on the C# packages
artifact_deps = [
"package_csharp_linux",
],
build_script = "run_distribtest_csharp_linux.sh",
docker_image_version = "tools/dockerfile/distribtest/csharp_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/csharp_debian11_x64.current_version",
)
grpc_run_distribtest_test(
@ -364,7 +364,7 @@ test_suite(
name = "csharp_distribtests_linux",
tests = [
":distribtest_csharp_linux_x64_alpine",
":distribtest_csharp_linux_x64_debian10",
":distribtest_csharp_linux_x64_debian11",
":distribtest_csharp_linux_x64_dotnet31",
":distribtest_csharp_linux_x64_dotnet5",
":distribtest_csharp_linux_x64_ubuntu2204",
@ -374,20 +374,20 @@ test_suite(
# PHP distribtests
grpc_run_distribtest_test(
name = "distribtest_php_linux_x64_debian10",
name = "distribtest_php_linux_x64_debian11",
size = "enormous",
artifact_deps = [
"artifact_php_linux_x64",
],
build_script = "run_distribtest_php_linux.sh",
docker_image_version = "tools/dockerfile/distribtest/php7_debian10_x64.current_version",
docker_image_version = "tools/dockerfile/distribtest/php7_debian11_x64.current_version",
docker_run_as_root = True,
)
test_suite(
name = "php_distribtests_linux",
tests = [
":distribtest_php_linux_x64_debian10",
":distribtest_php_linux_x64_debian11",
],
)

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_aarch64_cross_x64:3e47b89e6492db5a8a270263a30674cd45681b1c@sha256:32588bf15195f201ffd91ba279bc425b5b787712b21dcb41bb390341958c3cdb

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_x64:f381d64b950388336fa44e1ab689770d643a6bcd@sha256:cf1c89aa534084e0c8a6c90bfec42b66e48be16ae15ee97e2a1e7c7187756f33

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian11_aarch64_cross_x64:c1e5fbf1b67b9c74f7b1970c8728e9c3be7bace0@sha256:97ff55660fb93f4b31c029f2935bd18edf82e55d4df65376e55ed97b228a49c7

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:10
FROM debian:11
# gRPC C++ dependencies based on https://github.com/grpc/grpc/blob/master/BUILDING.md
RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean
@ -21,7 +21,8 @@ RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool
RUN apt-get update && apt-get install -y git && apt-get clean
# aarch cross-compiler
RUN apt-get update && apt-get install -y g++-8-aarch64-linux-gnu
RUN dpkg --add-architecture arm64
RUN apt-get update && apt-get install -y g++-10-aarch64-linux-gnu
RUN git config --global --add safe.directory /var/local/jenkins/grpc
RUN git config --global protocol.file.allow always

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian11_x64:20da024b357e37bfb6bf08ea5d91598d5ae7b7ad@sha256:beb3a8bedc067f4c8f54c8efe31f3d7149056c39c9751aaa395c788dd54e0a7e

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:10
FROM debian:11
# gRPC C++ dependencies based on https://github.com/grpc/grpc/blob/master/BUILDING.md
RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian10_x64:9e82424ae405a8672cf99507e6cd7792d259e942@sha256:a06871dfb9ce26880a38af75961f753123b7f9448947b40f5160ba1a4566ec4d

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64:5ad5823b4cd5cb6daa7342e069dd7f246e381fed@sha256:56db96cbb341ee2336a492b86f479814f8e819fd73499dca1f7c62e52c5c953a

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:10
FROM debian:11
RUN apt update && apt -y upgrade
RUN apt install -y apt-transport-https ca-certificates curl dirmngr gnupg unzip wget && apt clean
@ -24,7 +24,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
&& apt clean
# Install dotnet SDK
RUN wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb \
RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& apt update \
&& apt install -y dotnet-sdk-3.1 \

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian10_x64:166cdf0033d2f6355ab8a679145b9ed1866be1de@sha256:7791ae6f933d3697e3ff25b238edab52c167e088e35e7435663fa0ba1383587d

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_x64:0892cfafba20a8acae4db3272c4497c41cd627d2@sha256:e74902d75c5d0afdfb29f2f6200ef3e1b406cf4975c6a3a9a058ab101b004c7e

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:10
FROM debian:11
RUN apt-get update && apt-get install -y php php-dev php-pear wget zlib1g-dev

@ -393,31 +393,31 @@ def targets():
# C++
# The "dummy" C++ distribtest so that the set of tasks to run isn't empty
# when grpc_distribtest_standalone runs on PRs.
CppDistribTest("linux", "x64", "debian10", "dummy", presubmit=True),
CppDistribTest("linux", "x64", "debian10", "cmake", presubmit=False),
CppDistribTest("linux", "x64", "debian11", "dummy", presubmit=True),
CppDistribTest("linux", "x64", "debian11", "cmake", presubmit=False),
CppDistribTest(
"linux", "x64", "debian10", "cmake_as_submodule", presubmit=False
"linux", "x64", "debian11", "cmake_as_submodule", presubmit=False
),
CppDistribTest(
"linux",
"x64",
"debian10",
"debian11",
"cmake_as_externalproject",
presubmit=False,
),
CppDistribTest(
"linux", "x64", "debian10", "cmake_fetchcontent", presubmit=False
"linux", "x64", "debian11", "cmake_fetchcontent", presubmit=False
),
CppDistribTest(
"linux", "x64", "debian10", "cmake_module_install", presubmit=False
"linux", "x64", "debian11", "cmake_module_install", presubmit=False
),
CppDistribTest(
"linux", "x64", "debian10", "cmake_pkgconfig", presubmit=False
"linux", "x64", "debian11", "cmake_pkgconfig", presubmit=False
),
CppDistribTest(
"linux",
"x64",
"debian10_aarch64_cross",
"debian11_aarch64_cross",
"cmake_aarch64_cross",
presubmit=False,
),
@ -436,7 +436,7 @@ def targets():
),
# C#
CSharpDistribTest(
"linux", "x64", "debian10", use_dotnet_cli=True, presubmit=True
"linux", "x64", "debian11", use_dotnet_cli=True, presubmit=True
),
CSharpDistribTest("linux", "x64", "ubuntu2204", use_dotnet_cli=True),
CSharpDistribTest(
@ -505,6 +505,6 @@ def targets():
RubyDistribTest("linux", "x64", "ubuntu2004"),
RubyDistribTest("linux", "x64", "ubuntu2204", presubmit=True),
# PHP7
PHP7DistribTest("linux", "x64", "debian10", presubmit=True),
PHP7DistribTest("linux", "x64", "debian11", presubmit=True),
PHP7DistribTest("macos", "x64", presubmit=True),
]

Loading…
Cancel
Save