diff options
| author |  apolcyn <apolcyn@google.com> | 2018-01-04 17:10:47 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-04 17:10:47 -0800 |
| commit | 82eebafe3f1278f2333745a6bfb1dede6d17079f (patch) | |
| tree | aea77f84f06fe6773b186f8d2e3b849f1247ef8e | |
| parent | f526a2164f9c1eb816eea420f7201b8dfa278a8f (diff) | |
| parent | a3997fa50f98ff5dd5baac9c53c2cb8543384e6e (diff) | |
Merge pull request #13921 from apolcyn/backport_distribtest_fix
Backport 13793 to 1.8.x
| -rw-r--r-- | test/distrib/ruby/distribtest.gemspec | 2 | ||||
| -rwxr-xr-x | test/distrib/ruby/run_distrib_test.sh | 8 | ||||
| -rw-r--r-- | tools/run_tests/artifacts/distribtest_targets.py | 7 |
3 files changed, 15 insertions, 2 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} diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 9959651b6c..bf3d7a55e4 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -163,6 +163,10 @@ class RubyDistribTest(object): return [] def build_jobspec(self): + arch_to_gem_arch = { + 'x64': 'x86_64', + 'x86': 'x86', + } if not self.platform == 'linux': raise Exception("Not supported yet.") @@ -170,7 +174,8 @@ class RubyDistribTest(object): 'tools/dockerfile/distribtest/ruby_%s_%s' % ( self.docker_suffix, self.arch), - 'test/distrib/ruby/run_distrib_test.sh', + 'test/distrib/ruby/run_distrib_test.sh %s %s' % + (arch_to_gem_arch[self.arch], self.platform), copy_rel_path='test/distrib') def __str__(self): |