Merge "Apex: Fix OS_VERSION detection"

diff --git a/INFO.yaml b/INFO.yaml
index dae36c9..4b41d98 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -93,6 +93,11 @@ committers:
       email: 'lhinds@redhat.com'
       id: 'lukehinds'
       timezone: 'Europe/London'
+    - name: 'Cédric Ollivier'
+      email: 'cedric.ollivier@orange.com'
+      company: 'orange'
+      id: 'ollivier'
+      timezone: 'Europe/Paris'
 tsc:
     approval: 'http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html'
     changes:

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index d47e444..c383d7c 100644 (file)
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -61,7 +61,7 @@
             -v /home/opnfv/functest/tempest_blacklist.yaml:\
           /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
           tempest/custom_tests/blacklist.yaml \
-            -v /home/opnfv/functest/images/rally_blacklist.yaml:\
+            -v /home/opnfv/functest/rally_blacklist.yaml:\
           /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
           rally/blacklist.yaml \
             {repo}/functest-{container}:{tag} run_tests -t {test}