From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 19 Nov 2018 13:38:45 +0000 (+0100)
Subject: Fix functest-virtual (sudo + current dirs)
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=465dcefcd136847b8de27f83627dba3f76d72715

Fix functest-virtual (sudo + current dirs)

It completes the previous commit [1] pulling all images.

[1] https://gerrit.opnfv.org/gerrit/#/c/65203/

Change-Id: Id32aabf107064689a38d5ffb719ba5023c40296d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index fb908baaf..d47e44464 100644
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -12,7 +12,7 @@
     parameters:
       - functest-virtual-defaults
     builders:
-      - shell: docker pull {repo}/functest-{container}:{tag}
+      - shell: sudo docker pull {repo}/functest-{container}:{tag}
 
 - project:
     name: repo-functest-container-tag-pull
@@ -58,10 +58,10 @@
             -v /home/opnfv/functest/openstack.creds:\
           /home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            -v $(pwd)/tempest_blacklist.yaml:\
+            -v /home/opnfv/functest/tempest_blacklist.yaml:\
           /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
           tempest/custom_tests/blacklist.yaml \
-            -v $(pwd)/rally_blacklist.yaml:\
+            -v /home/opnfv/functest/images/rally_blacklist.yaml:\
           /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
           rally/blacklist.yaml \
             {repo}/functest-{container}:{tag} run_tests -t {test}