From dc3b4a468931910e1f010e63acc6cf5383dd556b Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 3 Feb 2016 12:57:49 -0800 Subject: [PATCH 1/2] Add package build script for Node.js --- tools/run_tests/build_package_node.sh | 39 +++++++++++++++++++++++++++ tools/run_tests/package_targets.py | 37 ++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 tools/run_tests/build_package_node.sh diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh new file mode 100644 index 00000000000..cdae8031825 --- /dev/null +++ b/tools/run_tests/build_package_node.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# Copyright 2016, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +set -ex + +cd $(dirname $0)/../.. + +cp -r architecture={x86,x64},language=node,platform={windows,linux,macos}/artifacts/* artifacts/ || true + +npm pack + +cp grpc-*.tgz artifacts/ diff --git a/tools/run_tests/package_targets.py b/tools/run_tests/package_targets.py index 5bc4b1c9c48..04ff650c8b1 100644 --- a/tools/run_tests/package_targets.py +++ b/tools/run_tests/package_targets.py @@ -32,6 +32,26 @@ import jobset +def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, + flake_retries=0, timeout_retries=0): + """Creates jobspec for a task running under docker.""" + environ = environ.copy() + environ['RUN_COMMAND'] = shell_command + + docker_args=[] + for k,v in environ.iteritems(): + docker_args += ['-e', '%s=%s' % (k, v)] + docker_env = {'DOCKERFILE_DIR': dockerfile_dir, + 'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh', + 'OUTPUT_DIR': 'artifacts'} + jobspec = jobset.JobSpec( + cmdline=['tools/jenkins/build_and_run_docker.sh'] + docker_args, + environ=docker_env, + shortname='build_artifact.%s' % (name), + timeout_seconds=30*60, + flake_retries=flake_retries, + timeout_retries=timeout_retries) + return jobspec def create_jobspec(name, cmdline, environ=None, cwd=None, shell=False, flake_retries=0, timeout_retries=0): @@ -67,7 +87,22 @@ class CSharpNugetTarget: def __str__(self): return self.name +class NodeNpmBinaryTarget: + """Builds Node NPM package and collects binaries""" + + def __init__(self): + self.name = 'node_npm_binary' + self.labels = ['package', 'csharp', 'windows'] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_linux_x64', + 'tools/run_tests/build_package_node.sh') def targets(): """Gets list of supported targets""" - return [CSharpNugetTarget()] + return [CSharpNugetTarget(), NodeNpmBinaryTarget()] From 3c3e58eb27d7c6745cca3268cd8153607a3e3a15 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 3 Feb 2016 13:43:29 -0800 Subject: [PATCH 2/2] Fixed copy/paste errors in package_target.py --- tools/run_tests/package_targets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/package_targets.py b/tools/run_tests/package_targets.py index 04ff650c8b1..997bc57cc5a 100644 --- a/tools/run_tests/package_targets.py +++ b/tools/run_tests/package_targets.py @@ -47,7 +47,7 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, jobspec = jobset.JobSpec( cmdline=['tools/jenkins/build_and_run_docker.sh'] + docker_args, environ=docker_env, - shortname='build_artifact.%s' % (name), + shortname='build_package.%s' % (name), timeout_seconds=30*60, flake_retries=flake_retries, timeout_retries=timeout_retries) @@ -92,7 +92,7 @@ class NodeNpmBinaryTarget: def __init__(self): self.name = 'node_npm_binary' - self.labels = ['package', 'csharp', 'windows'] + self.labels = ['package', 'node', 'linux'] def pre_build_jobspecs(self): return []