diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-03 15:57:20 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-03 15:57:20 -0800 |
| commit | efda009e24273b1b918eb60dbd542e5b2e33c478 (patch) | |
| tree | aa65aa74bc107338cfd94bb7330d6da91d8483ae /tools/run_tests | |
| parent | 6dacf8089f19b7d1fd274714abdceac4e174221e (diff) | |
| parent | 7cf8bf46aed8b0f741b5ddfe45eaa582985d4999 (diff) | |
Merge pull request #5048 from jtattermusch/fix_python_pkgnaming
Force 32bit uname when building artifacts
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/artifact_targets.py | 8 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_python.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_ruby.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py index 7e4601e85a..f71b8f7acd 100644 --- a/tools/run_tests/artifact_targets.py +++ b/tools/run_tests/artifact_targets.py @@ -97,9 +97,13 @@ class PythonArtifact: raise Exception('Not supported yet.') else: if self.platform == 'linux': + environ = {} + if self.arch == 'x86': + environ['SETARCH_CMD'] = 'linux32' return create_docker_jobspec(self.name, 'tools/dockerfile/grpc_artifact_linux_%s' % self.arch, - 'tools/run_tests/build_artifact_python.sh') + 'tools/run_tests/build_artifact_python.sh', + environ=environ) else: return create_jobspec(self.name, ['tools/run_tests/build_artifact_python.sh']) @@ -127,7 +131,7 @@ class RubyArtifact: if self.platform == 'linux': environ = {} if self.arch == 'x86': - environ['SETARCH_CMD'] = 'i386' + environ['SETARCH_CMD'] = 'linux32' return create_docker_jobspec(self.name, 'tools/dockerfile/grpc_artifact_linux_%s' % self.arch, 'tools/run_tests/build_artifact_ruby.sh', diff --git a/tools/run_tests/build_artifact_python.sh b/tools/run_tests/build_artifact_python.sh index 0ff6b2f8c0..0b263db8c0 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -37,7 +37,7 @@ pip install --upgrade setuptools pip install -rrequirements.txt -GRPC_PYTHON_BUILD_WITH_CYTHON=1 python setup.py \ +GRPC_PYTHON_BUILD_WITH_CYTHON=1 ${SETARCH_CMD} python setup.py \ bdist_wheel \ sdist \ bdist_egg_grpc_custom diff --git a/tools/run_tests/build_artifact_ruby.sh b/tools/run_tests/build_artifact_ruby.sh index 8f722ee420..482d128be3 100755 --- a/tools/run_tests/build_artifact_ruby.sh +++ b/tools/run_tests/build_artifact_ruby.sh @@ -32,7 +32,7 @@ set -ex cd $(dirname $0)/../.. -bundle install +${SETARCH_CMD} bundle install ${SETARCH_CMD} rake native gem |