From c0047f46b550e6d311f1786939a46257df0d650f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 5 Aug 2020 15:57:25 -0700 Subject: [PATCH] Upgrade Ubuntu 14.04 -> 18.04 --- .../distribtest/node_jessie_x64/Dockerfile | 21 ---------------- .../distribtest/node_jessie_x86/Dockerfile | 21 ---------------- .../node_ubuntu1404_x64/Dockerfile | 21 ---------------- .../node_ubuntu1604_x64/Dockerfile | 21 ---------------- .../Dockerfile | 4 ++-- .../Dockerfile | 4 ++-- .../ruby_ubuntu1404_x64/Dockerfile | 24 ------------------- .../Dockerfile | 10 ++++---- .../artifacts/distribtest_targets.py | 11 ++++++--- 9 files changed, 16 insertions(+), 121 deletions(-) delete mode 100644 tools/dockerfile/distribtest/node_jessie_x64/Dockerfile delete mode 100644 tools/dockerfile/distribtest/node_jessie_x86/Dockerfile delete mode 100644 tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile delete mode 100644 tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile rename tools/dockerfile/distribtest/{python_dev_ubuntu1404_x64 => python_dev_ubuntu1804_x64}/Dockerfile (93%) rename tools/dockerfile/distribtest/{python_ubuntu1404_x64 => python_ubuntu1804_x64}/Dockerfile (92%) delete mode 100644 tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile rename tools/dockerfile/distribtest/{node_centos7_x64 => ruby_ubuntu1804_x64}/Dockerfile (74%) diff --git a/tools/dockerfile/distribtest/node_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/node_jessie_x64/Dockerfile deleted file mode 100644 index bc2770b1e9a..00000000000 --- a/tools/dockerfile/distribtest/node_jessie_x64/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 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:jessie - -RUN apt-get update && apt-get install -y curl - -# Install nvm -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \ No newline at end of file diff --git a/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile deleted file mode 100644 index aa9695e3173..00000000000 --- a/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 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 i386/debian:jessie - -RUN apt-get update && apt-get install -y curl - -# Install nvm -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash diff --git a/tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile deleted file mode 100644 index e796d08202b..00000000000 --- a/tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 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 - -RUN apt-get update && apt-get install -y curl - -# Install nvm -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \ No newline at end of file diff --git a/tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile b/tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile deleted file mode 100644 index 7cc4a06073b..00000000000 --- a/tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 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:16.04 - -RUN apt-get update && apt-get install -y curl - -# Install nvm -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_dev_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile similarity index 93% rename from tools/dockerfile/distribtest/python_dev_ubuntu1404_x64/Dockerfile rename to tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile index 6c842aeba00..a7c48dd23f7 100644 --- a/tools/dockerfile/distribtest/python_dev_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2015 gRPC authors. +# 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. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:14.04 +FROM ubuntu:18.04 RUN apt-get update -y && apt-get install -y python python-pip diff --git a/tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile similarity index 92% rename from tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile rename to tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile index 91441d0a702..ac71663a346 100644 --- a/tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2015 gRPC authors. +# 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. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:14.04 +FROM ubuntu:18.04 RUN apt-get update -y && apt-get install -y python python-pip diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile deleted file mode 100644 index 8c933849292..00000000000 --- a/tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile +++ /dev/null @@ -1,24 +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 - -RUN apt-get update -y && apt-get install -y curl - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable --ruby - -RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc" -RUN /bin/bash -l -c "gem install --update bundler" diff --git a/tools/dockerfile/distribtest/node_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile similarity index 74% rename from tools/dockerfile/distribtest/node_centos7_x64/Dockerfile rename to tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile index 9de9c2b1bf3..9350a3f1b82 100644 --- a/tools/dockerfile/distribtest/node_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2016 gRPC authors. +# 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. @@ -12,10 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM centos:7 +FROM ubuntu:18.04 -RUN yum install -y curl +RUN apt-get update -y && apt-get install -y ruby-full -# Install nvm -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \ No newline at end of file +RUN gem install bundler diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 4c273c015f2..816729e3e8a 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -306,6 +306,7 @@ class CppDistribTest(object): def targets(): """Gets list of supported targets""" return [ + # C++ CppDistribTest('linux', 'x64', 'jessie', 'cmake_as_submodule'), CppDistribTest('linux', 'x64', 'stretch', 'cmake'), CppDistribTest('linux', 'x64', 'stretch', 'cmake_as_externalproject'), @@ -317,6 +318,7 @@ def targets(): CppDistribTest('linux', 'x64', 'stretch', 'raspberry_pi'), CppDistribTest('windows', 'x86', testcase='cmake'), CppDistribTest('windows', 'x86', testcase='cmake_as_externalproject'), + # C# CSharpDistribTest('linux', 'x64', 'jessie'), CSharpDistribTest('linux', 'x86', 'jessie'), CSharpDistribTest('linux', 'x64', 'stretch'), @@ -328,6 +330,7 @@ def targets(): CSharpDistribTest('macos', 'x86'), CSharpDistribTest('windows', 'x86'), CSharpDistribTest('windows', 'x64'), + # Python PythonDistribTest('linux', 'x64', 'jessie'), PythonDistribTest('linux', 'x86', 'jessie'), PythonDistribTest('linux', 'x64', 'centos6'), @@ -335,16 +338,17 @@ def targets(): PythonDistribTest('linux', 'x64', 'fedora23'), PythonDistribTest('linux', 'x64', 'opensuse'), PythonDistribTest('linux', 'x64', 'arch'), - PythonDistribTest('linux', 'x64', 'ubuntu1404'), PythonDistribTest('linux', 'x64', 'ubuntu1604'), + PythonDistribTest('linux', 'x64', 'ubuntu1804'), PythonDistribTest('linux', 'x64', 'alpine3.7', source=True), PythonDistribTest('linux', 'x64', 'jessie', source=True), PythonDistribTest('linux', 'x86', 'jessie', source=True), PythonDistribTest('linux', 'x64', 'centos7', source=True), PythonDistribTest('linux', 'x64', 'fedora23', source=True), PythonDistribTest('linux', 'x64', 'arch', source=True), - PythonDistribTest('linux', 'x64', 'ubuntu1404', source=True), PythonDistribTest('linux', 'x64', 'ubuntu1604', source=True), + PythonDistribTest('linux', 'x64', 'ubuntu1804', source=True), + # Ruby RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_3'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_4'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'), @@ -359,8 +363,9 @@ def targets(): RubyDistribTest('linux', 'x64', 'centos7'), RubyDistribTest('linux', 'x64', 'fedora23'), RubyDistribTest('linux', 'x64', 'opensuse'), - RubyDistribTest('linux', 'x64', 'ubuntu1404'), RubyDistribTest('linux', 'x64', 'ubuntu1604'), + RubyDistribTest('linux', 'x64', 'ubuntu1804'), + # PHP PHPDistribTest('linux', 'x64', 'jessie'), PHPDistribTest('macos', 'x64'), ]