Remove ruby 2.4 support (grpc#28522)

* changes to remove ruby 2.4 support * some fixes * remove opensuse since eol * fixes * remove unused x86 dockerfile * stop building for ruby 2.4 * update build scripts * fix scripts * fix sanity Co-authored-by: Jan Tattermusch <[email protected]>
xiaoluobo5 · Jan 11, 2022 · 95b313d · 95b313d
1 parent 4b3045b
commit 95b313d
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 164 deletions.
diff --git a/Rakefile b/Rakefile
@@ -117,7 +117,7 @@ task 'gem:native' do
   verbose = ENV['V'] || '0'
 
   grpc_config = ENV['GRPC_CONFIG'] || 'opt'
-  ruby_cc_versions = ['3.0.0', '2.7.0', '2.6.0', '2.5.0', '2.4.0'].join(':')
+  ruby_cc_versions = ['3.0.0', '2.7.0', '2.6.0', '2.5.0'].join(':')
 
   if RUBY_PLATFORM =~ /darwin/
     FileUtils.touch 'grpc_c.32.ruby'

diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template
@@ -15,7 +15,7 @@
     s.description   = 'Send RPCs from Ruby using GRPC'
     s.license       = 'Apache-2.0'
 
-    s.required_ruby_version = '>= 2.4.0'
+    s.required_ruby_version = '>= 2.5.0'
 
     s.files = %w( Makefile .yardopts )
     s.files += %w( etc/roots.pem )

diff --git a/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile
@@ -17,15 +17,15 @@ FROM centos:7
 RUN yum update -y && yum install -y curl tar which
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 2.3
-RUN /bin/bash -l -c "rvm install ruby-2.4.9"
-RUN /bin/bash -l -c "rvm use --default ruby-2.4.9"
+RUN /bin/bash -l -c "rvm install ruby-2.5.7"
+RUN /bin/bash -l -c "rvm use --default ruby-2.5.7"
 RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
 RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
-RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.4.9' >> ~/.bashrc"
+RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5.7' >> ~/.bashrc"
 RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
 
 RUN mkdir /var/local/jenkins

diff --git a/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile
diff --git a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile b/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile
diff --git a/tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile
diff --git a/tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile
diff --git a/...le/distribtest/ruby_jessie_x64/Dockerfile → ...e/distribtest/ruby_stretch_x64/Dockerfile b/...le/distribtest/ruby_jessie_x64/Dockerfile → ...e/distribtest/ruby_stretch_x64/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM debian:stretch
 
 RUN apt-get update && apt-get install -y ruby-full
 

diff --git a/...btest/ruby_jessie_x64_ruby_2_5/Dockerfile → ...test/ruby_stretch_x64_ruby_2_5/Dockerfile b/...btest/ruby_jessie_x64_ruby_2_5/Dockerfile → ...test/ruby_stretch_x64_ruby_2_5/Dockerfile
@@ -12,18 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM debian:stretch
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
+  gnupg2 \
+  procps \
   curl \
   gcc && apt-get clean
 
 #==================
 # Ruby dependencies
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 2.5

diff --git a/...btest/ruby_jessie_x64_ruby_2_6/Dockerfile → ...test/ruby_stretch_x64_ruby_2_6/Dockerfile b/...btest/ruby_jessie_x64_ruby_2_6/Dockerfile → ...test/ruby_stretch_x64_ruby_2_6/Dockerfile
@@ -12,18 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM debian:stretch
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
+  gnupg2 \
+  procps \
   curl \
   gcc && apt-get clean
 
 #==================
 # Ruby dependencies
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 2.6

diff --git a/...btest/ruby_jessie_x64_ruby_2_7/Dockerfile → ...test/ruby_stretch_x64_ruby_2_7/Dockerfile b/...btest/ruby_jessie_x64_ruby_2_7/Dockerfile → ...test/ruby_stretch_x64_ruby_2_7/Dockerfile
@@ -12,18 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM debian:stretch
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
+  gnupg2 \
+  procps \
   curl \
   gcc && apt-get clean
 
 #==================
 # Ruby dependencies
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 2.7

diff --git a/...btest/ruby_jessie_x64_ruby_3_0/Dockerfile → ...test/ruby_stretch_x64_ruby_3_0/Dockerfile b/...btest/ruby_jessie_x64_ruby_3_0/Dockerfile → ...test/ruby_stretch_x64_ruby_3_0/Dockerfile
@@ -12,18 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM debian:stretch
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
+  gnupg2 \
+  procps \
   curl \
   gcc && apt-get clean
 
 #==================
 # Ruby dependencies
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 3.0

diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1604_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu1604_x64/Dockerfile
@@ -23,13 +23,13 @@ RUN apt-get update -y && apt-get install -y \
 # Ruby dependencies
 
 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable
 
 # Install Ruby 2.4
-RUN /bin/bash -l -c "rvm install ruby-2.4.9"
-RUN /bin/bash -l -c "rvm use --default ruby-2.4.9"
+RUN /bin/bash -l -c "rvm install ruby-2.5.7"
+RUN /bin/bash -l -c "rvm use --default ruby-2.5.7"
 RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
 RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
-RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.4.9' >> ~/.bashrc"
+RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5.7' >> ~/.bashrc"
 RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
diff --git a/tools/internal_ci/linux/grpc_build_artifacts.sh b/tools/internal_ci/linux/grpc_build_artifacts.sh
@@ -26,7 +26,8 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
 set +ex
 [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
 set -e  # rvm commands are very verbose
-rvm --default use ruby-2.4.1
+rvm install ruby-2.5.7
+rvm --default use ruby-2.5.7
 set -ex
 
 tools/run_tests/task_runner.py -f artifact linux ${TASK_RUNNER_EXTRA_FILTERS} -j 12 || FAILED="true"

diff --git a/tools/internal_ci/linux/grpc_build_packages.sh b/tools/internal_ci/linux/grpc_build_packages.sh
@@ -26,7 +26,8 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
 set +ex
 [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
 set -e  # rvm commands are very verbose
-rvm --default use ruby-2.4.1
+rvm install ruby-2.5.7
+rvm --default use ruby-2.5.7
 set -ex
 
 # Move artifacts generated by the previous step in the build chain to a place

diff --git a/tools/internal_ci/linux/grpc_distribtests.sh b/tools/internal_ci/linux/grpc_distribtests.sh
@@ -31,7 +31,8 @@ source tools/internal_ci/helper_scripts/prepare_qemu_rc
 set +ex
 [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
 set -e  # rvm commands are very verbose
-rvm --default use ruby-2.4.1
+rvm install ruby-2.5.7
+rvm --default use ruby-2.5.7
 set -ex
 
 # Move packages generated by the previous step in the build chain to a place

diff --git a/tools/internal_ci/linux/grpc_distribtests_ruby.sh b/tools/internal_ci/linux/grpc_distribtests_ruby.sh
@@ -26,7 +26,8 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
 set +ex
 [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
 set -e  # rvm commands are very verbose
-rvm --default use ruby-2.4.1
+rvm install ruby-2.5.7
+rvm --default use ruby-2.5.7
 set -ex
 
 # Build all ruby linux artifacts (this step actually builds all the binary wheels and source archives)

diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
@@ -443,28 +443,21 @@ def targets():
         PythonDistribTest('linux', 'x64', 'arch', source=True),
         PythonDistribTest('linux', 'x64', 'ubuntu1804', source=True),
         # Ruby
+        RubyDistribTest('linux', 'x64', 'stretch', ruby_version='ruby_2_5'),
+        RubyDistribTest('linux', 'x64', 'stretch', ruby_version='ruby_2_6'),
         RubyDistribTest('linux',
                         'x64',
-                        'jessie',
-                        ruby_version='ruby_2_4',
-                        presubmit=True),
-        RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'),
-        RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_6'),
-        RubyDistribTest('linux',
-                        'x64',
-                        'jessie',
+                        'stretch',
                         ruby_version='ruby_2_7',
                         presubmit=True),
         # TODO(apolcyn): add a ruby 3.0 test once protobuf adds support
         RubyDistribTest('linux',
                         'x64',
-                        'jessie',
-                        ruby_version='ruby_2_4',
+                        'stretch',
+                        ruby_version='ruby_2_5',
                         source=True,
                         presubmit=True),
         RubyDistribTest('linux', 'x64', 'centos7'),
-        RubyDistribTest('linux', 'x64', 'fedora23'),
-        RubyDistribTest('linux', 'x64', 'opensuse'),
         RubyDistribTest('linux', 'x64', 'ubuntu1604'),
         RubyDistribTest('linux', 'x64', 'ubuntu1804', presubmit=True),
         # PHP7