diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-10 12:20:05 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-10 12:20:05 -0800 |
| commit | 4c10112a136946900f3729995b436b90ed7a6c62 (patch) | |
| tree | 98e1b26db15cfcba60ca7149d6e195d1485e884b | |
| parent | a8ba0c56158eca15cca58725a49a0ceb7e68e795 (diff) | |
| parent | 830f9a7780d1f2243181fb47c955e51e5d39ab00 (diff) | |
Merge pull request #5179 from murgatroid99/node_distrib_test_macos_0.13
Enable Node distrib tests on Mac on release-0_13
| -rw-r--r-- | tools/run_tests/distribtest_targets.py | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py index fc7dd17145..a46917c71e 100644 --- a/tools/run_tests/distribtest_targets.py +++ b/tools/run_tests/distribtest_targets.py @@ -106,28 +106,36 @@ class NodeDistribTest(object): """Tests Node package""" def __init__(self, platform, arch, docker_suffix, node_version): - self.name = 'node_npm_%s_%s_%s_%s' % (platform, arch, - docker_suffix, node_version) + self.name = 'node_npm_%s_%s_%s' % (platform, arch, node_version) self.platform = platform self.arch = arch - self.docker_suffix = docker_suffix self.node_version = node_version self.labels = ['distribtest', 'node', platform, arch, - docker_suffix, 'node-%s' % node_version] + 'node-%s' % node_version] + if docker_suffix is not None: + self.name += '_%s' % docker_suffix + self.docker_suffix = docker_suffix + self.labels.append(docker_suffix) def pre_build_jobspecs(self): return [] def build_jobspec(self): - if self.platform not in ('linux',): + if self.platform == 'linux': + return create_docker_jobspec(self.name, + 'tools/dockerfile/distribtest/node_%s_%s' % ( + self.docker_suffix, + self.arch), + 'test/distrib/node/run_distrib_test.sh %s' % ( + self.node_version)) + elif self.platform == 'macos': + return create_jobspec(self.name, + ['test/distrib/node/run_distrib_test.sh', + str(self.node_version)], + environ={'EXTERNAL_GIT_ROOT': '../../..'}) + else: raise Exception("Not supported yet.") - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/node_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/node/run_distrib_test.sh %s' % ( - self.node_version)) def __str__(self): return self.name @@ -228,6 +236,11 @@ def targets(): RubyDistribTest('linux', 'x64', 'ubuntu1504'), RubyDistribTest('linux', 'x64', 'ubuntu1510'), RubyDistribTest('linux', 'x64', 'ubuntu1604'), + NodeDistribTest('macos', 'x64', None, '0.10'), + NodeDistribTest('macos', 'x64', None, '0.12'), + NodeDistribTest('macos', 'x64', None, '3'), + NodeDistribTest('macos', 'x64', None, '4'), + NodeDistribTest('macos', 'x64', None, '5'), NodeDistribTest('linux', 'x86', 'jessie', '4') ] + [ NodeDistribTest('linux', 'x64', os, version) |