Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enhance variable manipulation in rally"
[functest.git]
/
functest
/
utils
/
env.py
diff --git
a/functest/utils/env.py
b/functest/utils/env.py
index
f6e6e10
..
110164b
100644
(file)
--- a/
functest/utils/env.py
+++ b/
functest/utils/env.py
@@
-13,7
+13,6
@@
class Environment(object): # pylint: disable=too-few-public-methods
default_envs = {
'NODE_NAME': 'unknown_pod',
default_envs = {
'NODE_NAME': 'unknown_pod',
- 'CI_DEBUG': 'false',
'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
'DEPLOY_TYPE': 'virt',
'INSTALLER_TYPE': None,
'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
'DEPLOY_TYPE': 'virt',
'INSTALLER_TYPE': None,
@@
-33,16
+32,9
@@
class Environment(object): # pylint: disable=too-few-public-methods
for key, value in six.iteritems(self.default_envs):
if key not in os.environ:
setattr(self, key, value)
for key, value in six.iteritems(self.default_envs):
if key not in os.environ:
setattr(self, key, value)
- self._set_ci_run()
if 'CI_LOOP' not in os.environ:
self._set_ci_loop()
if 'CI_LOOP' not in os.environ:
self._set_ci_loop()
- def _set_ci_run(self):
- if getattr(self, "BUILD_TAG"):
- setattr(self, "IS_CI_RUN", True)
- else:
- setattr(self, "IS_CI_RUN", False)
-
def _set_ci_loop(self):
if (getattr(self, "BUILD_TAG") and
re.search("daily", getattr(self, "BUILD_TAG"))):
def _set_ci_loop(self):
if (getattr(self, "BUILD_TAG") and
re.search("daily", getattr(self, "BUILD_TAG"))):