summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2016-11-28 06:15:58 +0000
committerchenjiankun <chenjiankun1@huawei.com>2016-11-28 06:17:24 +0000
commit64cb92222b3574d8c1ec907051b79f9ef87691ab (patch)
tree1299d7a7ec588870fbfcb22bf032dfd0431d4168
parent1f7db42e0bf885e814e36e08bcd9f5e3d505392b (diff)
Make the requirements.txt compatible with Colorado
JIRA: YARDSTICK-428 Now in master, we move the requirements.txt from tests/ci/ to yardstick root path. But in colorado, this has yet to be done.If we cherry pick from master to colorado, it will encounter error. So we must make it compatible. Change-Id: I0537d989e677b73e19a1e093166493f3f6d25783 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 0cc6cd606..abc6eeb4b 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -122,7 +122,7 @@
# install python packages
easy_install -U setuptools
easy_install -U pip
- pip install -r requirements.txt
+ pip install -r requirements.txt || pip install -r tests/ci/requirements.txt
pip install -e .
# unit tests