From 99cfec00344f3518aa74ee5610613ed1fc53d021 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 30 Jul 2020 15:54:30 +0200 Subject: [PATCH] remove no longer useful cxx_sanitizers_jessie portability test (clang "7.0") --- .../Dockerfile.template | 32 -------- .../test/cxx_sanitizers_jessie_x64/Dockerfile | 81 ------------------- tools/run_tests/run_tests.py | 6 +- tools/run_tests/run_tests_matrix.py | 2 +- 4 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template delete mode 100644 tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile diff --git a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template deleted file mode 100644 index 8d2a40ab023..00000000000 --- a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 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. - - # This is the base Docker image we use for running tests on RBE - FROM gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd - RUN sed -i '/deb http:\/\/httpredir.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list - - <%include file="../../apt_get_basic.include"/> - <%include file="../../python_deps.include"/> - <%include file="../../gcp_api_libraries.include"/> - #================= - # C++ dependencies (purposely excluding Clang because it's part of the base image) - RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev && apt-get clean - - # Link llvm-symbolizer to where our test scripts expect to find it - RUN ln -s /usr/local/bin/llvm-symbolizer /usr/bin/llvm-symbolizer - - # Define the default command. - CMD ["bash"] diff --git a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile deleted file mode 100644 index 08ed1da1a3d..00000000000 --- a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2018 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. - -# This is the base Docker image we use for running tests on RBE -FROM gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd -RUN sed -i '/deb http:\/\/httpredir.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -#==================== -# Python dependencies - -# Install dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-setuptools - -# Install Python packages from PyPI -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 -RUN pip install --upgrade pip==19.3.1 -RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 - -# Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client - -#================= -# C++ dependencies (purposely excluding Clang because it's part of the base image) -RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev && apt-get clean - -# Link llvm-symbolizer to where our test scripts expect to find it -RUN ln -s /usr/local/bin/llvm-symbolizer /usr/bin/llvm-symbolizer - -# Define the default command. -CMD ["bash"] diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 6c8113ea07d..db5e321cc92 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -493,10 +493,6 @@ class CLanguage(object): elif compiler == 'clang3.7': return ('ubuntu1604', self._clang_make_options(version_suffix='-3.7')) - elif compiler == 'clang7.0': - # clang++-7.0 alias doesn't exist and there are no other clang versions - # installed. - return ('sanitizers_jessie', self._clang_make_options()) else: raise Exception('Compiler %s not supported.' % compiler) @@ -1458,7 +1454,7 @@ argp.add_argument( '--compiler', choices=[ 'default', 'gcc4.9', 'gcc5.3', 'gcc7.4', 'gcc8.3', 'gcc_musl', - 'clang3.5', 'clang3.6', 'clang3.7', 'clang7.0', 'python2.7', + 'clang3.5', 'clang3.6', 'clang3.7', 'python2.7', 'python3.5', 'python3.6', 'python3.7', 'python3.8', 'pypy', 'pypy3', 'python_alpine', 'all_the_cpythons', 'electron1.3', 'electron1.6', 'coreclr', 'cmake', 'cmake_vs2015', 'cmake_vs2017' diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 730bae8aef9..982c19d9a03 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -276,7 +276,7 @@ def _create_portability_test_jobs(extra_args=[], # portability C and C++ on x64 for compiler in [ 'gcc4.9', 'gcc5.3', 'gcc7.4', 'gcc8.3', 'gcc_musl', 'clang3.5', - 'clang3.6', 'clang3.7', 'clang7.0' + 'clang3.6', 'clang3.7' ]: test_jobs += _generate_jobs(languages=['c', 'c++'], configs=['dbg'],