From: Ciprian Barbu <ciprian.barbu@enea.com>
Date: Tue, 26 Jul 2016 16:15:11 +0000 (+0300)
Subject: Bump rally to 0.5.0 and add shyaml
X-Git-Tag: colorado.1.0~209
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F17561%2F3;p=functest.git

Bump rally to 0.5.0 and add shyaml

A newer version of rally brings in this change that is required by armband:
https://bugs.launchpad.net/rally/+bug/1580695

The shyaml cli parser can be used to make the healthcheck testcase
configurable, for instance to pass a different cirros image other than the one
for x86_64. Also required by armband to make functest execute all tests.

Change-Id: Ic4976bb6d4a4753e56deade35b641f1127af3162
Signed-off-by: Ciprian Barbu <ciprian.barbu@enea.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3053382da..e138c73dc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -70,7 +70,7 @@ RUN git config --global http.sslVerify false
 RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
 RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
 RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
-RUN git clone -b 0.3.3 https://github.com/openstack/rally.git ${repos_dir}/rally
+RUN git clone -b 0.5.0 https://github.com/openstack/rally.git ${repos_dir}/rally
 RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest
 RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git ${repos_dir}/odl_test
 RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
diff --git a/docker/requirements.pip b/docker/requirements.pip
index fa6681e8e..f590b2a03 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -23,4 +23,5 @@ xmltodict==0.9.2
 scp==0.10.2
 paramiko==1.16.0
 python-congressclient==1.3.0
-subprocess32
\ No newline at end of file
+subprocess32
+shyaml