Update all Debian:9 to Debian:10 (#31917)

examples/android/helloworld/app/build.gradle

@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
+    ndkVersion "25.1.8937393"
     defaultConfig {
         applicationId "io.grpc.android.cpp.helloworldexample"
         minSdkVersion 21
+        // noinspection ExpiredTargetSDKVersion
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

examples/android/helloworld/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip

src/android/test/interop/app/build.gradle

@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
+    ndkVersion "25.1.8937393"
     defaultConfig {
         applicationId "io.grpc.android.interop.cpp"
         minSdkVersion 21
+        // noinspection ExpiredTargetSDKVersion
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

src/android/test/interop/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

src/android/test/interop/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip

templates/tools/dockerfile/test/android_ndk/Dockerfile.template

@@ -14,15 +14,19 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
-  FROM debian:stretch
+  FROM debian:10
   
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../run_tests_python_deps.include"/>
   <%include file="../../cmake.include"/>
   <%include file="../../run_tests_addons.include"/>
 
-  # Java required by Android SDK
-  RUN apt-get update && apt-get -y install openjdk-8-jdk && apt-get clean
+  # Java required by Android SDK (using Eclipse Temurin Package)
+  RUN apt install -y wget apt-transport-https && ${'\\'}
+      mkdir -p /etc/apt/keyrings && ${'\\'}
+      wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc && ${'\\'}
+      echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+  RUN apt update && apt install -y temurin-8-jdk
 
   # Install Android SDK
   ENV ANDROID_SDK_VERSION 4333796
@@ -34,17 +38,6 @@
   ENV ANDROID_HOME /opt/android-sdk
   RUN yes | $ANDROID_SDK_PATH/tools/bin/sdkmanager --licenses  # accept all licenses
 
-  # Install ndk-bundle and cmake using sdkmanager
-  RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
-  RUN $ANDROID_SDK_PATH/tools/bin/sdkmanager ndk-bundle 'cmake;3.6.4111459'
-
-  # Install Android NDK
-  RUN curl -L -o android-ndk.zip http://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && ${'\\'}
-      unzip -q android-ndk.zip -d /opt && ${'\\'}
-      rm -f android-ndk.zip
-  ENV ANDROID_NDK_PATH /opt/android-ndk-r16b
-  ENV ANDROID_NDK_HOME /opt/android-ndk-r16b
-
   # Install gcloud
   RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-407.0.0-linux-x86_64.tar.gz && ${'\\'}
       tar -xf google-cloud-cli-407.0.0-linux-x86_64.tar.gz && ${'\\'}

test/distrib/cpp/run_distrib_test_cmake_aarch64_cross.sh

@@ -48,8 +48,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-6)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-6)
+set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc-8)
+set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-8)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version

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

tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64/Dockerfile

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # 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 libtool pkg-config && apt-get clean
-
-# debian stretch has cmake 3.7: https://packages.debian.org/stretch/cmake
-RUN apt-get update && apt-get install -y cmake && apt-get clean
+RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean
 
 # C++ distribtests are setup in a way that requires git
 RUN apt-get update && apt-get install -y git && apt-get clean
 
 # aarch cross-compiler
-RUN apt-get update && apt-get install -y g++-6-aarch64-linux-gnu
+RUN apt-get update && apt-get install -y g++-8-aarch64-linux-gnu
+
+RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global protocol.file.allow always
 
 CMD ["bash"]

tools/dockerfile/distribtest/cpp_debian10_x64.current_version

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

tools/dockerfile/distribtest/cpp_debian10_x64/Dockerfile

@@ -12,15 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # 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 libtool pkg-config && apt-get clean
-
-# debian stretch has cmake 3.7: https://packages.debian.org/stretch/cmake
-RUN apt-get update && apt-get install -y cmake && apt-get clean
+RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean
 
 # C++ distribtests are setup in a way that requires git
 RUN apt-get update && apt-get install -y git && apt-get clean
 
+RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global protocol.file.allow always
+
+
 CMD ["bash"]

tools/dockerfile/distribtest/csharp_debian10_x64.current_version

@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian10_x64:0ebcec2f23bd9e270d100e58e7de954e714225ad@sha256:8c3838e731da70566adc6f989f2c29351fdb2f629e8797928699fff24b3a0938

tools/dockerfile/distribtest/csharp_debian10_x64/Dockerfile

@@ -0,0 +1,38 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM debian:10
+
+RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl dirmngr gnupg unzip wget && apt-get clean
+
+# Install mono
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
+    && echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
+    && apt-get update && apt-get install -y mono-devel nuget \
+    && apt-get clean
+
+# Install dotnet SDK
+RUN wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && apt update \
+    && apt install -y dotnet-sdk-3.1 \
+    && apt-get clean
+
+# Make sure the mono certificate store is up-to-date to prevent issues with nuget restore
+RUN curl https://curl.haxx.se/ca/cacert.pem > ~/cacert.pem && cert-sync ~/cacert.pem && rm -f ~/cacert.pem
+
+# we have a separate distribtest for netcoreapp2.1
+ENV SKIP_NETCOREAPP21_DISTRIBTEST=1
+# we have a separate distribtest for net5.0
+ENV SKIP_NET50_DISTRIBTEST=1

tools/dockerfile/distribtest/csharp_stretch_x64/Dockerfile

@@ -1,46 +0,0 @@
-# Copyright 2019 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM debian:stretch
-
-RUN apt-get update && apt-get install -y apt-transport-https dirmngr gnupg ca-certificates && apt-get clean
-
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-RUN echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list
-
-RUN apt-get update && apt-get install -y \
-    mono-devel \
-    nuget \
-    && apt-get clean
-
-RUN apt-get update && apt-get install -y curl && apt-get clean
-
-# Install dotnet SDK
-ENV DOTNET_SDK_VERSION 2.1.500
-RUN curl -sSL -o dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \
-    && mkdir -p /usr/share/dotnet \
-    && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \
-    && rm dotnet.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-
-RUN apt-get update && apt-get install -y unzip && apt-get clean
-
-# Make sure the mono certificate store is up-to-date to prevent issues with nuget restore
-RUN apt-get update && apt-get install -y curl && apt-get clean
-RUN curl https://curl.haxx.se/ca/cacert.pem > ~/cacert.pem && cert-sync ~/cacert.pem && rm -f ~/cacert.pem
-
-# we have a separate distribtest for netcoreapp3.1
-ENV SKIP_NETCOREAPP31_DISTRIBTEST=1
-# we have a separate distribtest for net5.0
-ENV SKIP_NET50_DISTRIBTEST=1

tools/dockerfile/distribtest/php7_debian10_x64.current_version

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

tools/dockerfile/distribtest/php7_debian10_x64/Dockerfile

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

tools/dockerfile/distribtest/ruby_debian10_x64.current_version

@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64:0efa3a484833ce2b8960ad449d62571a8d595f65@sha256:1298c39c950b2a48261555b6cff1ae66230a5020f100d3b381759285f0caf84e

tools/dockerfile/distribtest/ruby_debian10_x64/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 RUN apt-get update && apt-get install -y ruby-full
 

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_6.current_version

@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_2_6:49b4854d213d0219ae41d4cfe38192df26958aa8@sha256:3ef9a84a77276f2ccaca3c97336573f76ed02719645e4bb67ccdf1f33da99fc8

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_6/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_7.current_version

@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_2_7:9a09a0a915e62249957791eda907a011078c5aea@sha256:5ee26ad3abe2683c9a8ee03987ab0ae63f50793c3d3f5e4be6e6cbacb4556fcf

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_7/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_3_0.current_version

@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_3_0:c277dbca7dbd28ff6112cbc842ba3144c49266bd@sha256:9190da90a2a95eca1370cef64dcba7ddee9f59cc7487093da6711c1280a0b0f9

tools/dockerfile/distribtest/ruby_debian10_x64_ruby_3_0/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

tools/dockerfile/test/android_ndk.current_version

@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/android_ndk:fbf61e53ebd3588252f88a355c9afe9119013338@sha256:0778ede020d2af6bcc76d8d40a3fabcfeef5fd492515da5518ec29079fd45f89
+us-docker.pkg.dev/grpc-testing/testing-images-public/android_ndk:47e2befd3ceab97fa3e8ad5b8499b684380d624d@sha256:256ff2bb8fd6c6921cd7653f79fa495669c6466f78df96f71867f89f6d487ff3

tools/dockerfile/test/android_ndk/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 #=================
 # Basic C core dependencies
@@ -88,8 +88,12 @@ RUN apt-get update && apt-get install -y cmake && apt-get clean
 RUN mkdir /var/local/jenkins
 
 
-# Java required by Android SDK
-RUN apt-get update && apt-get -y install openjdk-8-jdk && apt-get clean
+# Java required by Android SDK (using Eclipse Temurin Package)
+RUN apt install -y wget apt-transport-https && \
+    mkdir -p /etc/apt/keyrings && \
+    wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc && \
+    echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+RUN apt update && apt install -y temurin-8-jdk
 
 # Install Android SDK
 ENV ANDROID_SDK_VERSION 4333796
@@ -101,17 +105,6 @@ ENV ANDROID_SDK_PATH /opt/android-sdk
 ENV ANDROID_HOME /opt/android-sdk
 RUN yes | $ANDROID_SDK_PATH/tools/bin/sdkmanager --licenses  # accept all licenses
 
-# Install ndk-bundle and cmake using sdkmanager
-RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
-RUN $ANDROID_SDK_PATH/tools/bin/sdkmanager ndk-bundle 'cmake;3.6.4111459'
-
-# Install Android NDK
-RUN curl -L -o android-ndk.zip http://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && \
-    unzip -q android-ndk.zip -d /opt && \
-    rm -f android-ndk.zip
-ENV ANDROID_NDK_PATH /opt/android-ndk-r16b
-ENV ANDROID_NDK_HOME /opt/android-ndk-r16b
-
 # Install gcloud
 RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-407.0.0-linux-x86_64.tar.gz && \
     tar -xf google-cloud-cli-407.0.0-linux-x86_64.tar.gz && \

tools/run_tests/artifacts/distribtest_targets.py

@@ -348,35 +348,35 @@ def targets():
     """Gets list of supported targets"""
     return [
         # C++
-        CppDistribTest('linux', 'x64', 'stretch', 'cmake', presubmit=True),
+        CppDistribTest('linux', 'x64', 'debian10', 'cmake', presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch',
+                       'debian10',
                        'cmake_as_submodule',
                        presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch',
+                       'debian10',
                        'cmake_as_externalproject',
                        presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch',
+                       'debian10',
                        'cmake_fetchcontent',
                        presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch',
+                       'debian10',
                        'cmake_module_install',
                        presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch',
+                       'debian10',
                        'cmake_pkgconfig',
                        presubmit=True),
         CppDistribTest('linux',
                        'x64',
-                       'stretch_aarch64_cross',
+                       'debian10_aarch64_cross',
                        'cmake_aarch64_cross',
                        presubmit=True),
         CppDistribTest('windows', 'x86', testcase='cmake', presubmit=True),
@@ -387,7 +387,7 @@ def targets():
         # C#
         CSharpDistribTest('linux',
                           'x64',
-                          'stretch',
+                          'debian10',
                           use_dotnet_cli=True,
                           presubmit=True),
         CSharpDistribTest('linux', 'x64', 'ubuntu1604', use_dotnet_cli=True),
@@ -433,19 +433,19 @@ def targets():
         # Ruby
         RubyDistribTest('linux',
                         'x64',
-                        'stretch',
+                        'debian10',
                         ruby_version='ruby_2_6',
                         source=True,
                         presubmit=True),
         RubyDistribTest('linux',
                         'x64',
-                        'stretch',
+                        'debian10',
                         ruby_version='ruby_2_7',
                         presubmit=True),
         RubyDistribTest('linux', 'x64', 'centos7'),
         RubyDistribTest('linux', 'x64', 'ubuntu1604'),
         RubyDistribTest('linux', 'x64', 'ubuntu1804', presubmit=True),
         # PHP7
-        PHP7DistribTest('linux', 'x64', 'stretch', presubmit=True),
+        PHP7DistribTest('linux', 'x64', 'debian10', presubmit=True),
         PHP7DistribTest('macos', 'x64', presubmit=True),
     ]