Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Obtain build_tag by CONST instead of get function
[functest.git]
/
functest
/
utils
/
env.py
diff --git
a/functest/utils/env.py
b/functest/utils/env.py
index
fa5245f
..
2fb766d
100644
(file)
--- a/
functest/utils/env.py
+++ b/
functest/utils/env.py
@@
-1,25
+1,34
@@
+#!/usr/bin/env python
+
+import pkg_resources
import os
import re
import os
import re
+import six
+
+
default_envs = {
'NODE_NAME': 'unknown_pod',
default_envs = {
'NODE_NAME': 'unknown_pod',
- 'CI_DEBUG': '
tru
e',
+ 'CI_DEBUG': '
fals
e',
'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
'DEPLOY_TYPE': 'virt',
'INSTALLER_TYPE': None,
'INSTALLER_IP': None,
'BUILD_TAG': None,
'OS_ENDPOINT_TYPE': None,
'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
'DEPLOY_TYPE': 'virt',
'INSTALLER_TYPE': None,
'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):
}
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)
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()
if k not in os.environ:
self.__setattr__(k, v)
self._set_ci_run()