From 847a4715e54e0e1a72b1fe08a625b879b3831a41 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 30 Jul 2020 15:40:39 +0200
Subject: [PATCH] remove clang3.4 portability test: ubuntu14.04 is EOL

---
 .../cxx_ubuntu1404_x64/Dockerfile.template    | 25 ------
 .../test/cxx_ubuntu1404_x64/Dockerfile        | 79 -------------------
 tools/run_tests/run_tests.py                  |  5 +-
 3 files changed, 1 insertion(+), 108 deletions(-)
 delete mode 100644 templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
 delete mode 100644 tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile

diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
deleted file mode 100644
index 3e92dd1a811..00000000000
--- a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
+++ /dev/null
@@ -1,25 +0,0 @@
-%YAML 1.2
---- |
-  # Copyright 2015 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 ubuntu:14.04
-  
-  <%include file="../../apt_get_basic.include"/>
-  <%include file="../../python_deps.include"/>
-  <%include file="../../gcp_api_libraries.include"/>
-  <%include file="../../cxx_deps.include"/>
-  <%include file="../../run_tests_addons.include"/>
-  # Define the default command.
-  CMD ["bash"]
diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile
deleted file mode 100644
index 08cff8d3b2a..00000000000
--- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2015 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 ubuntu:14.04
-
-# 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
-RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
-
-
-RUN mkdir /var/local/jenkins
-
-# Define the default command.
-CMD ["bash"]
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 28d417688b9..6c8113ea07d 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -485,9 +485,6 @@ class CLanguage(object):
             return ('buster', [])
         elif compiler == 'gcc_musl':
             return ('alpine', [])
-        elif compiler == 'clang3.4':
-            # on ubuntu1404, clang-3.4 alias doesn't exist, just use 'clang'
-            return ('ubuntu1404', self._clang_make_options())
         elif compiler == 'clang3.5':
             return ('jessie', self._clang_make_options(version_suffix='-3.5'))
         elif compiler == 'clang3.6':
@@ -1461,7 +1458,7 @@ argp.add_argument(
     '--compiler',
     choices=[
         'default', 'gcc4.9', 'gcc5.3', 'gcc7.4', 'gcc8.3', 'gcc_musl',
-        'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', 'clang7.0', 'python2.7',
+        'clang3.5', 'clang3.6', 'clang3.7', 'clang7.0', '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'