From 95b313de82322ddb51fe1dff8704b58bbf442420 Mon Sep 17 00:00:00 2001 From: apolcyn Date: Tue, 11 Jan 2022 04:30:58 -0800 Subject: [PATCH] Remove ruby 2.4 support (#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 --- Rakefile | 2 +- grpc.gemspec | 2 +- templates/grpc.gemspec.template | 2 +- .../distribtest/ruby_centos7_x64/Dockerfile | 8 ++-- .../distribtest/ruby_fedora23_x64/Dockerfile | 39 ------------------ .../ruby_jessie_x64_ruby_2_4/Dockerfile | 40 ------------------- .../distribtest/ruby_jessie_x86/Dockerfile | 19 --------- .../distribtest/ruby_opensuse_x64/Dockerfile | 30 -------------- .../Dockerfile | 2 +- .../Dockerfile | 6 ++- .../Dockerfile | 6 ++- .../Dockerfile | 6 ++- .../Dockerfile | 6 ++- .../ruby_ubuntu1604_x64/Dockerfile | 8 ++-- .../internal_ci/linux/grpc_build_artifacts.sh | 3 +- .../internal_ci/linux/grpc_build_packages.sh | 3 +- tools/internal_ci/linux/grpc_distribtests.sh | 3 +- .../linux/grpc_distribtests_ruby.sh | 3 +- .../artifacts/distribtest_targets.py | 17 +++----- 19 files changed, 41 insertions(+), 164 deletions(-) delete mode 100644 tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile delete mode 100644 tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile delete mode 100644 tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile delete mode 100644 tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile rename tools/dockerfile/distribtest/{ruby_jessie_x64 => ruby_stretch_x64}/Dockerfile (97%) rename tools/dockerfile/distribtest/{ruby_jessie_x64_ruby_2_5 => ruby_stretch_x64_ruby_2_5}/Dockerfile (87%) rename tools/dockerfile/distribtest/{ruby_jessie_x64_ruby_2_6 => ruby_stretch_x64_ruby_2_6}/Dockerfile (87%) rename tools/dockerfile/distribtest/{ruby_jessie_x64_ruby_2_7 => ruby_stretch_x64_ruby_2_7}/Dockerfile (87%) rename tools/dockerfile/distribtest/{ruby_jessie_x64_ruby_3_0 => ruby_stretch_x64_ruby_3_0}/Dockerfile (87%) diff --git a/Rakefile b/Rakefile index be175cf143c..ab311966317 100755 --- 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 index dcf41c86cfc..6341ed93e45 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| 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/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index bde0f36b894..961875f9e52 100644 --- 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 index b781e92aea0..dc55a8c5a80 100644 --- 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 deleted file mode 100644 index 56c564f5886..00000000000 --- a/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile +++ /dev/null @@ -1,39 +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 fedora:23 - -# Make yum work properly under docker when using overlay storage driver. -# https://bugzilla.redhat.com/show_bug.cgi?id=1213602#c9 -# https://github.com/docker/docker/issues/10180 -RUN yum install -y yum-plugin-ovl - -# distro-sync and install openssl, per https://github.com/fedora-cloud/docker-brew-fedora/issues/19 -RUN yum clean all && yum update -y && yum distro-sync -y && yum install -y openssl gnupg which findutils tar procps - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --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 "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 "gem install bundler -v 1.17.3 --no-document" - -RUN mkdir /var/local/jenkins - -RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc" diff --git a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile b/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile deleted file mode 100644 index a645b1802af..00000000000 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile +++ /dev/null @@ -1,40 +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 debian:jessie - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - curl \ - gcc && apt-get clean - -#================== -# Ruby dependencies - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --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 "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 "gem install bundler -v 1.17.3 --no-document" - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile deleted file mode 100644 index 48fba1fc2a2..00000000000 --- a/tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile +++ /dev/null @@ -1,19 +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 i386/debian:jessie - -RUN apt-get update && apt-get install -y ruby-full - -RUN gem install bundler -v 1.17.3 --no-document diff --git a/tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile deleted file mode 100644 index 74ddf5ce54c..00000000000 --- a/tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile +++ /dev/null @@ -1,30 +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 opensuse:42.1 - -RUN zypper --non-interactive install curl - -RUN zypper --non-interactive install tar which - -RUN zypper --non-interactive install ca-certificates-mozilla - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable --ruby - -# OpenSUSE is a bit crazy and ignores .bashrc for login shell. -RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.profile" - -RUN /bin/bash -l -c 'gem install --update bundler' diff --git a/tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_stretch_x64/Dockerfile similarity index 97% rename from tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile rename to tools/dockerfile/distribtest/ruby_stretch_x64/Dockerfile index 077aa16a057..fd48745384c 100644 --- a/tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/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/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_5/Dockerfile b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_5/Dockerfile similarity index 87% rename from tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_5/Dockerfile rename to tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_5/Dockerfile index 44b36e55277..5d029008235 100644 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_5/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_5/Dockerfile @@ -12,10 +12,12 @@ # 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 @@ -23,7 +25,7 @@ RUN apt-get update && apt-get install -y \ # 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/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_6/Dockerfile b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_6/Dockerfile similarity index 87% rename from tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_6/Dockerfile rename to tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_6/Dockerfile index fab8d53b2be..eea189f3c97 100644 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_6/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_6/Dockerfile @@ -12,10 +12,12 @@ # 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 @@ -23,7 +25,7 @@ RUN apt-get update && apt-get install -y \ # 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/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_7/Dockerfile b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_7/Dockerfile similarity index 87% rename from tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_7/Dockerfile rename to tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_7/Dockerfile index d5aeb9f22a9..1325fb3d628 100644 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_7/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_2_7/Dockerfile @@ -12,10 +12,12 @@ # 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 @@ -23,7 +25,7 @@ RUN apt-get update && apt-get install -y \ # 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/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_3_0/Dockerfile b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_3_0/Dockerfile similarity index 87% rename from tools/dockerfile/distribtest/ruby_jessie_x64_ruby_3_0/Dockerfile rename to tools/dockerfile/distribtest/ruby_stretch_x64_ruby_3_0/Dockerfile index fbcacfda4d4..e883c8e1059 100644 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_3_0/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_stretch_x64_ruby_3_0/Dockerfile @@ -12,10 +12,12 @@ # 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 @@ -23,7 +25,7 @@ RUN apt-get update && apt-get install -y \ # 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 index 3d3b04b35a8..7640b0be42c 100644 --- 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 index 130c3492198..38c39cbf6af 100755 --- 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 index f9b8953ecf0..4ce6d2e1c05 100644 --- 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 index c809f22ee76..bfb1bd8aec7 100644 --- 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 index 0d848617781..710c14da363 100755 --- 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 index 2a4991fba74..705fdac0e26 100644 --- 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