From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 1 Nov 2018 08:52:43 +0000 (+0100)
Subject: Override tempest_conf.yaml in ci jobs
X-Git-Tag: opnfv-8.1.0~121
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F64365%2F1;p=functest.git

Override tempest_conf.yaml in ci jobs

It also removes STORAGE_PROTOCOL (env var) which was removed.

Change-Id: Ib0f388f20c52ebf2409d2aca0bcba5c641287b40
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e715a8309122c3fa3b4983cfa53c82519dd6ead7)
---

diff --git a/ci/run.yaml b/ci/run.yaml
index c7e27eccc..63dbdbd43 100644
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -7,11 +7,13 @@
           docker run \
             -e NAMESERVER={nameserver} \
             -e EXTERNAL_NETWORK={external_network} \
-            -e STORAGE_PROTOCOL={storage_protocol} \
             -v \
             {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \
             -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v {prefix}/images:/home/opnfv/functest/images \
+            -v {prefix}/tempest_conf.yaml:\
+          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack\
+          /tempest/custom_tests/tempest_conf.yaml \
             {repo}/functest-{container}:{tag} run_tests -t {test}
 
 - project: