From: Tim Rozet <trozet@redhat.com>
Date: Mon, 19 Nov 2018 18:36:42 +0000 (+0000)
Subject: Merge "Apex: Fix OS_VERSION detection"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ba6c7504201c56df6f2052cdb73c800b303447a8;hp=70893c9b8ce4cc2306a0931733a386927a07415c;p=releng.git

Merge "Apex: Fix OS_VERSION detection"
---

diff --git a/INFO.yaml b/INFO.yaml
index dae36c9b4..4b41d98d8 100644
--- 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 d47e44464..c383d7c13 100644
--- 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}