diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-15 18:34:03 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-15 18:34:03 -0700 |
| commit | 0327ce5ca851440f168ae3a8b359e4a13a88f2e8 (patch) | |
| tree | dfe85914b837a27c738298164e37e4d49e75fd4b | |
| parent | 58ff670f03dda1116420a838a6d2ade4a15eb4c5 (diff) | |
| parent | b8c15247284cacc54c6b17f2bab624db36ec7f44 (diff) | |
Merge pull request #2390 from nicolasnoble/we-have-both-kinds
Enabling 32 bits downgrade of our environment.
| -rwxr-xr-x | tools/jenkins/docker_run_jenkins.sh | 2 | ||||
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/jenkins/docker_run_jenkins.sh b/tools/jenkins/docker_run_jenkins.sh index 90107169ba..eb6c9144c6 100755 --- a/tools/jenkins/docker_run_jenkins.sh +++ b/tools/jenkins/docker_run_jenkins.sh @@ -42,4 +42,4 @@ cd /var/local/git/grpc nvm use 0.12 rvm use ruby-2.1 tools/run_tests/prepare_travis.sh -tools/run_tests/run_tests.py -t -c $config -l $language -x report.xml +$arch tools/run_tests/run_tests.py -t -c $config -l $language -x report.xml diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index af49ea0bd0..dcd0424aec 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -37,6 +37,16 @@ # NOTE: No empty lines should appear in this file before igncr is set! set -ex -o igncr || set -ex +# Grabbing the machine's architecture +arch=`uname -m` + +case $platform in + i386) + arch="i386" + platform="linux" + ;; +esac + if [ "$platform" == "linux" ] then echo "building $language on Linux" @@ -61,6 +71,7 @@ then docker run \ -e "config=$config" \ -e "language=$language" \ + -e "arch=$arch" \ -i \ -v "$git_root:/var/local/jenkins/grpc" \ --cidfile=docker.cid \ |