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

diff --git a/functest/utils/env.py b/functest/utils/env.py
index 7e4df2ea5..d7b396eaa 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,6 +1,12 @@
+#!/usr/bin/env python
+
+import pkg_resources
 import os
 import re
 
+import six
+
+
 default_envs = {
     'NODE_NAME': 'unknown_pod',
     'CI_DEBUG': 'false',
@@ -10,20 +16,24 @@ default_envs = {
     'INSTALLER_IP': None,
     'BUILD_TAG': None,
     'OS_ENDPOINT_TYPE': None,
-    'OS_AUTH_URL': None
+    'OS_AUTH_URL': None,
+    'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
+        'functest', 'ci/config_functest.yaml'),
+    'OS_INSECURE': ''
 }
 
 
 class Environment(object):
 
     def __init__(self):
-        for k, v in os.environ.iteritems():
+        for k, v in six.iteritems(os.environ):
             self.__setattr__(k, v)
-        for k, v in default_envs.iteritems():
+        for k, v in six.iteritems(default_envs):
             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: