X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=functest%2Futils%2Fenv.py;h=d7b396eaa11b4cd7b16800d1b023042e7c86bbb3;hb=8043d389978b97a39f82c621381a0dff0b1425cd;hp=3724ec998bab90d919d2324637e995960aa5c04c;hpb=efbe74c4cc1b6b6982e9e13950319f690541d6a3;p=functest.git

diff --git a/functest/utils/env.py b/functest/utils/env.py
index 3724ec998..d7b396eaa 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import pkg_resources
 import os
 import re
 
@@ -16,8 +17,9 @@ default_envs = {
     'BUILD_TAG': None,
     'OS_ENDPOINT_TYPE': None,
     'OS_AUTH_URL': None,
-    'CONFIG_FUNCTEST_YAML': os.path.normpath(os.path.join(os.path.dirname(
-        os.path.abspath(__file__)), '../ci/config_functest.yaml'))
+    'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
+        'functest', 'ci/config_functest.yaml'),
+    'OS_INSECURE': ''
 }
 
 
@@ -30,7 +32,8 @@ class Environment(object):
             if k not in os.environ:
                 self.__setattr__(k, v)
         self._set_ci_run()
-        self._set_ci_loop()
+        if 'CI_LOOP' not in os.environ:
+            self._set_ci_loop()
 
     def _set_ci_run(self):
         if self.BUILD_TAG: