From 4964b6b86a0240d39890588de2e971fbb26c7c44 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 13 Oct 2015 08:24:28 -0700 Subject: [PATCH 1/4] add run_interop.sh jenins script --- tools/jenkins/run_interop.sh | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 tools/jenkins/run_interop.sh diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh new file mode 100755 index 00000000000..c80c374acee --- /dev/null +++ b/tools/jenkins/run_interop.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# Copyright 2015, 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. +# +# This script is invoked by Jenkins and runs interop test suite. +set -ex + +# Enter the gRPC repo root +cd `dirname $0`/../.. + +tools/run_tests/run_interop_tests.py --l all --s all --cloud_to_prod --use_docker -t -j 8 From 265dfc0d038d37009f752a476021c396efffced5 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 13 Oct 2015 09:37:49 -0700 Subject: [PATCH 2/4] use recommended syntax for command subtitution --- tools/jenkins/run_interop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh index c80c374acee..61398933f3b 100755 --- a/tools/jenkins/run_interop.sh +++ b/tools/jenkins/run_interop.sh @@ -32,6 +32,6 @@ set -ex # Enter the gRPC repo root -cd `dirname $0`/../.. +cd $(dirname $0)/../.. tools/run_tests/run_interop_tests.py --l all --s all --cloud_to_prod --use_docker -t -j 8 From 8c894e41b8ffbacb31c15120f8a47ed645b8cc82 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 13 Oct 2015 09:40:27 -0700 Subject: [PATCH 3/4] enable propagating per-jenkins job args --- tools/jenkins/run_interop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh index 61398933f3b..072812b3ba4 100755 --- a/tools/jenkins/run_interop.sh +++ b/tools/jenkins/run_interop.sh @@ -34,4 +34,4 @@ set -ex # Enter the gRPC repo root cd $(dirname $0)/../.. -tools/run_tests/run_interop_tests.py --l all --s all --cloud_to_prod --use_docker -t -j 8 +tools/run_tests/run_interop_tests.py --l all --s all --cloud_to_prod --use_docker -t -j 8 $@ || true From dd30134eecdf23d9b6d68931eba82b98d99000b0 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 13 Oct 2015 13:01:01 -0700 Subject: [PATCH 4/4] fix a nit --- tools/jenkins/run_interop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh index 072812b3ba4..14e075691cd 100755 --- a/tools/jenkins/run_interop.sh +++ b/tools/jenkins/run_interop.sh @@ -34,4 +34,4 @@ set -ex # Enter the gRPC repo root cd $(dirname $0)/../.. -tools/run_tests/run_interop_tests.py --l all --s all --cloud_to_prod --use_docker -t -j 8 $@ || true +tools/run_tests/run_interop_tests.py -l all -s all --cloud_to_prod --use_docker -t -j 8 $@ || true