You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ap...@apache.org on 2019/03/07 19:06:14 UTC
[incubator-mxnet] branch master updated: Installs qemu pip
requirements from qemu requirements file (#14355)
This is an automated email from the ASF dual-hosted git repository.
apeforest pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 2b7d57d Installs qemu pip requirements from qemu requirements file (#14355)
2b7d57d is described below
commit 2b7d57d6d0e25e3db84a99cc0832e5e7066cbab8
Author: perdasilva <pe...@gmail.com>
AuthorDate: Thu Mar 7 20:05:55 2019 +0100
Installs qemu pip requirements from qemu requirements file (#14355)
---
ci/docker/qemu/runtime_functions.py | 4 ++--
ci/docker/qemu/vmcontrol.py | 1 +
ci/qemu/README.md | 4 ++++
ci/qemu/test_requirements.txt | 3 +++
tests/requirements.txt | 1 +
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ci/docker/qemu/runtime_functions.py b/ci/docker/qemu/runtime_functions.py
index 8b8e5ac..5a57cb8 100755
--- a/ci/docker/qemu/runtime_functions.py
+++ b/ci/docker/qemu/runtime_functions.py
@@ -77,8 +77,8 @@ def run_ut_python3_qemu_internal():
logging.info("=== NOW Running inside QEMU ===")
logging.info("PIP Installing %s", pkg)
check_call(['sudo', 'pip3', 'install', pkg])
- logging.info("PIP Installing mxnet/tests/requirements.txt")
- check_call(['sudo', 'pip3', 'install', '-r', 'mxnet/tests/requirements.txt'])
+ logging.info("PIP Installing mxnet/test_requirements.txt")
+ check_call(['sudo', 'pip3', 'install', '-r', 'mxnet/test_requirements.txt'])
logging.info("Running tests in mxnet/tests/python/unittest/")
check_call(['nosetests', '--with-timer', '--with-xunit', '--xunit-file', 'nosetests_unittest.xml', '--verbose', 'mxnet/tests/python/unittest/test_engine.py'])
# Example to run a single unit test:
diff --git a/ci/docker/qemu/vmcontrol.py b/ci/docker/qemu/vmcontrol.py
index d80e22b..31ef4d2 100644
--- a/ci/docker/qemu/vmcontrol.py
+++ b/ci/docker/qemu/vmcontrol.py
@@ -229,6 +229,7 @@ def qemu_provision(ssh_port=QEMU_SSH_PORT):
qemu_rsync(ssh_port, '/work/runtime_functions.py','')
qemu_rsync(ssh_port, '/work/vmcontrol.py','')
qemu_rsync(ssh_port, 'mxnet/tests', 'mxnet')
+ qemu_rsync(ssh_port, 'mxnet/ci/qemu/test_requirements.txt', 'mxnet/test_requirements.txt')
logging.info("Provisioning completed successfully.")
diff --git a/ci/qemu/README.md b/ci/qemu/README.md
index 498f8b7..4beca4a 100644
--- a/ci/qemu/README.md
+++ b/ci/qemu/README.md
@@ -86,3 +86,7 @@ pip3 install -r mxnet_requirements.txt
To access qemu control console from tmux: `ctrl-a a c`
+
+# CI and Testing
+
+Formally, [runtime_functions.py](https://github.com/apache/incubator-mxnet/blob/master/ci/docker/qemu/runtime_functions.py) would [run](https://github.com/apache/incubator-mxnet/blob/8beea18e3d9835f90b59d3f9de8f9945ac819423/ci/docker/qemu/runtime_functions.py#L81) *pip install -r [mxnet/tests/requirements.txt](https://github.com/apache/incubator-mxnet/blob/master/tests/requirements.txt)*. If the requirements change, there can be an unfortunate side-effect that there are no wheel files fo [...]
diff --git a/ci/qemu/test_requirements.txt b/ci/qemu/test_requirements.txt
new file mode 100644
index 0000000..77037d8
--- /dev/null
+++ b/ci/qemu/test_requirements.txt
@@ -0,0 +1,3 @@
+mock
+nose
+nose-timer
\ No newline at end of file
diff --git a/tests/requirements.txt b/tests/requirements.txt
index f64f7ff..8a68512 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,5 @@
# Requirements for tests, those are installed before running on the virtualenv
+# Requirements for tests run within the qemu requirement see ci/qemu/test_requirements.txt
mock
nose
nose-timer