Drop support for ruby < 2.3; update and unskip distrib tests

pull/19304/head
Alexander Polcyn 6 years ago committed by Alex Polcyn
parent a6a6175ff1
commit 9aa48c6d1c
  1. 4
      Rakefile
  2. 2
      grpc.gemspec
  3. 2
      templates/grpc.gemspec.template
  4. 10
      tools/dockerfile/distribtest/ruby_centos6_x64/Dockerfile
  5. 10
      tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile
  6. 10
      tools/dockerfile/distribtest/ruby_fedora20_x64/Dockerfile
  7. 10
      tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile
  8. 40
      tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_2/Dockerfile
  9. 14
      tools/run_tests/artifacts/distribtest_targets.py

@ -124,10 +124,10 @@ task 'gem:native' do
"invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \ "invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \
"build should be running on ruby 2.5." "build should be running on ruby 2.5."
end end
system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0:2.2.2 V=#{verbose} GRPC_CONFIG=#{grpc_config}" system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
else else
Rake::Task['dlls'].execute Rake::Task['dlls'].execute
docker_for_windows "gem update --system --no-document && bundle && rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0:2.2.2 V=#{verbose} GRPC_CONFIG=#{grpc_config}" docker_for_windows "gem update --system --no-document && bundle && rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
end end
end end

@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.description = 'Send RPCs from Ruby using GRPC' s.description = 'Send RPCs from Ruby using GRPC'
s.license = 'Apache-2.0' s.license = 'Apache-2.0'
s.required_ruby_version = '>= 2.0.0' s.required_ruby_version = '>= 2.3.0'
s.files = %w( Makefile .yardopts ) s.files = %w( Makefile .yardopts )
s.files += %w( etc/roots.pem ) s.files += %w( etc/roots.pem )

@ -15,7 +15,7 @@
s.description = 'Send RPCs from Ruby using GRPC' s.description = 'Send RPCs from Ruby using GRPC'
s.license = 'Apache-2.0' s.license = 'Apache-2.0'
s.required_ruby_version = '>= 2.0.0' s.required_ruby_version = '>= 2.3.0'
s.files = %w( Makefile .yardopts ) s.files = %w( Makefile .yardopts )
s.files += %w( etc/roots.pem ) s.files += %w( etc/roots.pem )

@ -22,15 +22,15 @@ RUN yum install -y tar which
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN curl -sSL https://get.rvm.io | bash -s stable RUN curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.2 # Install Ruby 2.3
# Running the installation twice to work around docker issue when using overlay. # Running the installation twice to work around docker issue when using overlay.
# https://github.com/docker/docker/issues/10180 # https://github.com/docker/docker/issues/10180
RUN (/bin/bash -l -c "rvm install ruby-2.2.10") || (/bin/bash -l -c "rvm install ruby-2.2.10") RUN (/bin/bash -l -c "rvm install ruby-2.3.8") || (/bin/bash -l -c "rvm install ruby-2.3.8")
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10" RUN /bin/bash -l -c "rvm use --default ruby-2.3.8"
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" 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 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN /bin/bash -l -c "gem install bundler --no-document"
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

@ -20,13 +20,13 @@ RUN yum update && yum install -y curl tar which
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN curl -sSL https://get.rvm.io | bash -s stable RUN curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.2 # Install Ruby 2.3
RUN /bin/bash -l -c "rvm install ruby-2.2.10" RUN /bin/bash -l -c "rvm install ruby-2.3.8"
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10" RUN /bin/bash -l -c "rvm use --default ruby-2.3.8"
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" 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 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN /bin/bash -l -c "gem install bundler --no-document"
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

@ -21,15 +21,15 @@ RUN yum clean all && yum update -y && yum distro-sync -y && yum install -y opens
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN curl -sSL https://get.rvm.io | bash -s stable RUN curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.2 # Install Ruby 2.3
# Running the installation twice to work around docker issue when using overlay. # Running the installation twice to work around docker issue when using overlay.
# https://github.com/docker/docker/issues/10180 # https://github.com/docker/docker/issues/10180
RUN (/bin/bash -l -c "rvm install ruby-2.2.10") || (/bin/bash -l -c "rvm install ruby-2.2.10") RUN (/bin/bash -l -c "rvm install ruby-2.3.8") || (/bin/bash -l -c "rvm install ruby-2.3.8")
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10" RUN /bin/bash -l -c "rvm use --default ruby-2.3.8"
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" 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 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN /bin/bash -l -c "gem install bundler --no-document"
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

@ -26,13 +26,13 @@ RUN yum clean all && yum update -y && yum distro-sync -y && yum install -y opens
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN curl -sSL https://get.rvm.io | bash -s stable RUN curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.2 # Install Ruby 2.3
RUN /bin/bash -l -c "rvm install ruby-2.2.10" RUN /bin/bash -l -c "rvm install ruby-2.3.8"
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10" RUN /bin/bash -l -c "rvm use --default ruby-2.3.8"
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" 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 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN /bin/bash -l -c "gem install bundler --no-document"
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

@ -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.2
RUN /bin/bash -l -c "rvm install ruby-2.2.10"
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
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.2.10' >> ~/.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"]

@ -340,14 +340,12 @@ def targets():
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_4'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_4'),
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'),
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_6'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_6'),
# TODO(apolcyn): unskip these after upgrading the ruby versions RubyDistribTest('linux', 'x64', 'centos6'),
# of these dockerfiles to >= 2.3. RubyDistribTest('linux', 'x64', 'centos7'),
# RubyDistribTest('linux', 'x64', 'centos6'), RubyDistribTest('linux', 'x64', 'fedora20'),
# RubyDistribTest('linux', 'x64', 'centos7'), RubyDistribTest('linux', 'x64', 'fedora21'),
# RubyDistribTest('linux', 'x64', 'fedora20'), RubyDistribTest('linux', 'x64', 'fedora22'),
# RubyDistribTest('linux', 'x64', 'fedora21'), RubyDistribTest('linux', 'x64', 'fedora23'),
# RubyDistribTest('linux', 'x64', 'fedora22'),
# RubyDistribTest('linux', 'x64', 'fedora23'),
RubyDistribTest('linux', 'x64', 'opensuse'), RubyDistribTest('linux', 'x64', 'opensuse'),
RubyDistribTest('linux', 'x64', 'ubuntu1204'), RubyDistribTest('linux', 'x64', 'ubuntu1204'),
RubyDistribTest('linux', 'x64', 'ubuntu1404'), RubyDistribTest('linux', 'x64', 'ubuntu1404'),

Loading…
Cancel
Save