Merge pull request #21812 from jtattermusch/cpp_distribtest_cleanup

C++ distribtest improvements

test/distrib/cpp/run_distrib_test_cmake.sh

@@ -17,11 +17,8 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev
+# Install openssl (to use instead of boringssl)
+apt-get update && apt-get install -y libssl-dev
 
 # Install absl
 mkdir -p "third_party/abseil-cpp/cmake/build"

test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh

@@ -17,11 +17,8 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev
+# Install openssl (to use instead of boringssl)
+apt-get update && apt-get install -y libssl-dev
 
 # To increase the confidence that gRPC installation works without depending on
 # too many submodules unnecessarily, just wipe out contents of most submodules

test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh

@@ -18,13 +18,11 @@ set -ex
 cd "$(dirname "$0")/../../.."
 grpc_dir=$(pwd)
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev wget
+# 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

test/distrib/cpp/run_distrib_test_cmake_module_install.sh

@@ -17,13 +17,11 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev wget
+# 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

test/distrib/cpp/run_distrib_test_cmake_module_install_pkgconfig.sh

@@ -17,13 +17,11 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev pkg-config wget
+# 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

test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh

@@ -17,11 +17,8 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y libssl-dev pkg-config
+# Install openssl (to use instead of boringssl)
+apt-get update && apt-get install -y libssl-dev
 
 # Install absl
 mkdir -p "third_party/abseil-cpp/cmake/build"

test/distrib/cpp/run_distrib_test_raspberry_pi.sh

@@ -17,13 +17,11 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-apt-get update
-apt-get install -t jessie-backports -y git libssl-dev wget
+# 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

tools/dockerfile/distribtest/cpp_stretch_x64/Dockerfile

@@ -0,0 +1,26 @@
+# Copyright 2020 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
+
+# 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
+
+# C++ distribtests are setup in a way that requires git
+RUN apt-get update && apt-get install -y git && apt-get clean
+
+CMD ["bash"]

tools/run_tests/artifacts/distribtest_targets.py

@@ -297,15 +297,15 @@ def targets():
     """Gets list of supported targets"""
     return [
         CppDistribTest('linux', 'x64', 'jessie', 'routeguide'),
-        CppDistribTest('linux', 'x64', 'jessie', 'cmake'),
-        CppDistribTest('linux', 'x64', 'jessie', 'cmake_as_externalproject'),
         CppDistribTest('linux', 'x64', 'jessie', 'cmake_as_submodule'),
-        CppDistribTest('linux', 'x64', 'jessie', 'cmake_fetchcontent'),
-        CppDistribTest('linux', 'x64', 'jessie', 'cmake_module_install'),
-        CppDistribTest('linux', 'x64', 'jessie',
+        CppDistribTest('linux', 'x64', 'stretch', 'cmake'),
+        CppDistribTest('linux', 'x64', 'stretch', 'cmake_as_externalproject'),
+        CppDistribTest('linux', 'x64', 'stretch', 'cmake_fetchcontent'),
+        CppDistribTest('linux', 'x64', 'stretch', 'cmake_module_install'),
+        CppDistribTest('linux', 'x64', 'stretch',
                        'cmake_module_install_pkgconfig'),
-        CppDistribTest('linux', 'x64', 'jessie', 'cmake_pkgconfig'),
-        CppDistribTest('linux', 'x64', 'jessie', 'raspberry_pi'),
+        CppDistribTest('linux', 'x64', 'stretch', 'cmake_pkgconfig'),
+        CppDistribTest('linux', 'x64', 'stretch', 'raspberry_pi'),
         CppDistribTest('windows', 'x86', testcase='cmake'),
         CppDistribTest('windows', 'x86', testcase='cmake_as_externalproject'),
         CSharpDistribTest('linux', 'x64', 'jessie'),