aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/artifacts/distribtest_targets.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/run_tests/artifacts/distribtest_targets.py')
-rw-r--r--tools/run_tests/artifacts/distribtest_targets.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
index b2cc16acd4..fdf094cd01 100644
--- a/tools/run_tests/artifacts/distribtest_targets.py
+++ b/tools/run_tests/artifacts/distribtest_targets.py
@@ -174,11 +174,13 @@ class PythonDistribTest(object):
class RubyDistribTest(object):
"""Tests Ruby package"""
- def __init__(self, platform, arch, docker_suffix):
- self.name = 'ruby_%s_%s_%s' % (platform, arch, docker_suffix)
+ def __init__(self, platform, arch, docker_suffix, ruby_version=None):
+ self.name = 'ruby_%s_%s_%s_version_%s' % (platform, arch, docker_suffix,
+ ruby_version or 'unspecified')
self.platform = platform
self.arch = arch
self.docker_suffix = docker_suffix
+ self.ruby_version = ruby_version
self.labels = ['distribtest', 'ruby', platform, arch, docker_suffix]
def pre_build_jobspecs(self):
@@ -192,10 +194,13 @@ class RubyDistribTest(object):
if not self.platform == 'linux':
raise Exception("Not supported yet.")
+ dockerfile_name = 'tools/dockerfile/distribtest/ruby_%s_%s' % (
+ self.docker_suffix, self.arch)
+ if self.ruby_version is not None:
+ dockerfile_name += '_%s' % self.ruby_version
return create_docker_jobspec(
self.name,
- 'tools/dockerfile/distribtest/ruby_%s_%s' % (self.docker_suffix,
- self.arch),
+ dockerfile_name,
'test/distrib/ruby/run_distrib_test.sh %s %s' %
(arch_to_gem_arch[self.arch], self.platform),
copy_rel_path='test/distrib')
@@ -314,6 +319,7 @@ def targets():
RubyDistribTest('linux', 'x64', 'wheezy'),
RubyDistribTest('linux', 'x64', 'jessie'),
RubyDistribTest('linux', 'x86', 'jessie'),
+ RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_0_0'),
RubyDistribTest('linux', 'x64', 'centos6'),
RubyDistribTest('linux', 'x64', 'centos7'),
RubyDistribTest('linux', 'x64', 'fedora20'),