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
/
functest_utils.py
diff --git
a/functest/utils/functest_utils.py
b/functest/utils/functest_utils.py
index
995d94f
..
bf68e43
100644
(file)
--- a/
functest/utils/functest_utils.py
+++ b/
functest/utils/functest_utils.py
@@
-11,6
+11,7
@@
import functools
import json
import logging
import os
import json
import logging
import os
+import pkg_resources
import re
import shutil
import subprocess
import re
import shutil
import subprocess
@@
-22,7
+23,6
@@
import dns.resolver
import requests
from six.moves import urllib
import yaml
import requests
from six.moves import urllib
import yaml
-from git import Repo
from functest.utils import constants
from functest.utils import decorators
from functest.utils import constants
from functest.utils import decorators
@@
-68,15
+68,6
@@
def download_url(url, dest_path):
# CI UTILS
#
# -----------------------------------------------------------
# CI UTILS
#
# -----------------------------------------------------------
-def get_git_branch(repo_path):
- """
- Get git branch name
- """
- repo = Repo(repo_path)
- branch = repo.active_branch
- return branch.name
-
-
def get_installer_type():
"""
Get installer type (fuel, apex, joid, compass)
def get_installer_type():
"""
Get installer type (fuel, apex, joid, compass)
@@
-116,7
+107,9
@@
def get_version():
# jenkins-functest-fuel-baremetal-weekly-master-8
# use regex to match branch info
rule = "(dai|week)ly-(.+?)-[0-9]*"
# jenkins-functest-fuel-baremetal-weekly-master-8
# use regex to match branch info
rule = "(dai|week)ly-(.+?)-[0-9]*"
- build_tag = get_build_tag()
+ build_tag = CONST.__getattribute__('BUILD_TAG')
+ if not build_tag:
+ build_tag = 'none'
m = re.search(rule, build_tag)
if m:
return m.group(2)
m = re.search(rule, build_tag)
if m:
return m.group(2)
@@
-137,19
+130,6
@@
def get_pod_name():
return "unknown-pod"
return "unknown-pod"
-def get_build_tag():
- """
- Get build tag of jenkins jobs
- """
- try:
- build_tag = os.environ['BUILD_TAG']
- except KeyError:
- logger.info("Impossible to retrieve the build tag")
- build_tag = "none"
-
- return build_tag
-
-
def logger_test_results(project, case_name, status, details):
"""
Format test case results for the logger
def logger_test_results(project, case_name, status, details):
"""
Format test case results for the logger
@@
-157,7
+137,7
@@
def logger_test_results(project, case_name, status, details):
pod_name = get_pod_name()
scenario = get_scenario()
version = get_version()
pod_name = get_pod_name()
scenario = get_scenario()
version = get_version()
- build_tag =
get_build_tag(
)
+ build_tag =
CONST.__getattribute__('BUILD_TAG'
)
db_url = CONST.__getattribute__("results_test_db_url")
logger.info(
db_url = CONST.__getattribute__("results_test_db_url")
logger.info(
@@
-326,7
+306,8
@@
def execute_command(cmd, info=False, error_msg="",
def get_dict_by_test(testname):
def get_dict_by_test(testname):
- with open(get_testcases_file_dir()) as f:
+ with open(pkg_resources.resource_filename(
+ 'functest', 'ci/testcases.yaml')) as f:
testcases_yaml = yaml.safe_load(f)
for dic_tier in testcases_yaml.get("tiers"):
testcases_yaml = yaml.safe_load(f)
for dic_tier in testcases_yaml.get("tiers"):
@@
-386,10
+367,6
@@
def merge_dicts(dict1, dict2):
yield (k, dict2[k])
yield (k, dict2[k])
-def get_testcases_file_dir():
- return get_functest_config('general.functest.testcases_yaml')
-
-
def get_functest_yaml():
with open(constants.CONST.__getattribute__('CONFIG_FUNCTEST_YAML')) as f:
functest_yaml = yaml.safe_load(f)
def get_functest_yaml():
with open(constants.CONST.__getattribute__('CONFIG_FUNCTEST_YAML')) as f:
functest_yaml = yaml.safe_load(f)