diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2017-12-14 15:58:26 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2017-12-15 09:48:21 -0800 |
| commit | acd56b736102c0ba40a9b782f8252d750205f88e (patch) | |
| tree | c5498cc499b25c39460ba1f81c814e3fa297b365 /test | |
| parent | 5d37e61d069a3d33fba15db35151d013a298537f (diff) | |
Fix failing ruby distrib tests on ruby 2.0 images
Diffstat (limited to 'test')
| -rw-r--r-- | test/distrib/ruby/distribtest.gemspec | 2 | ||||
| -rwxr-xr-x | test/distrib/ruby/run_distrib_test.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/distrib/ruby/distribtest.gemspec b/test/distrib/ruby/distribtest.gemspec index d72892f46c..f11f5218d5 100644 --- a/test/distrib/ruby/distribtest.gemspec +++ b/test/distrib/ruby/distribtest.gemspec @@ -14,6 +14,8 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.add_dependency 'grpc', '>=0' + s.add_dependency 'public_suffix', '< 3.0' + s.add_dependency 'jwt', '< 2.0' s.add_development_dependency 'bundler', '~> 1.7' end diff --git a/test/distrib/ruby/run_distrib_test.sh b/test/distrib/ruby/run_distrib_test.sh index 0c214e38f2..d74f4cd76d 100755 --- a/test/distrib/ruby/run_distrib_test.sh +++ b/test/distrib/ruby/run_distrib_test.sh @@ -17,10 +17,16 @@ set -ex cd $(dirname $0) +ARCH=$1 +PLATFORM=$2 # Create an indexed local gem source with gRPC gems to test GEM_SOURCE=../../../gem_source mkdir -p ${GEM_SOURCE}/gems -cp -r $EXTERNAL_GIT_ROOT/input_artifacts/*.gem ${GEM_SOURCE}/gems +cp $EXTERNAL_GIT_ROOT/input_artifacts/grpc-*$ARCH-$PLATFORM.gem ${GEM_SOURCE}/gems +if [[ "$(ls ${GEM_SOURCE}/gems | grep grpc | wc -l)" != 1 ]]; then + echo "Sanity check failed. Copied over more than one grpc gem into the gem source directory." + exit 1 +fi; gem install builder gem generate_index --directory ${GEM_SOURCE} |