diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-07-11 02:38:35 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-07-16 02:11:38 +0200 |
| commit | b8c15247284cacc54c6b17f2bab624db36ec7f44 (patch) | |
| tree | a0e1e537502ef6b8f5f4336c1ef538db8d0db2d3 /tools/jenkins | |
| parent | 4547d503d37ade45866688dae3ce291ec8a450bd (diff) | |
Enabling 32 bits downgrade of our environment.
Diffstat (limited to 'tools/jenkins')
| -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 \ |