diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-12-05 14:44:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-05 14:44:51 +0000 |
| commit | 4d8205412586812dc9523988aad66cf9e000e31e (patch) | |
| tree | 198f4976bb1f0263e41cb1a1cd9d4db4439914c3 /functest/ci | |
| parent | 122445d0b7b3836a3617905ab1c293412983c394 (diff) | |
| parent | d13fac5935bb3fe573dc9a79e06b8cffde37712e (diff) | |
Merge "Fix Pep8 issues related to \"
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/generate_report.py | 4 | ||||
| -rwxr-xr-x | functest/ci/prepare_env.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 9ae9dca5..a90bc555 100755 --- a/functest/ci/generate_report.py +++ b/functest/ci/generate_report.py @@ -41,8 +41,8 @@ def init(tiers_to_run): def get_results_from_db(): - url = ft_utils.get_db_url() + '/results?build_tag=' \ - + GlobalVariables.BUILD_TAG + url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), + GlobalVariables.BUILD_TAG) logger.debug("Query to rest api: %s" % url) try: data = json.load(urllib2.urlopen(url)) diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 246a02a8..3a99d3ba 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -124,8 +124,7 @@ def source_rc_file(): logger.warning("The environment variable 'creds' must be set and" "pointing to the local RC file. Using default: " "/home/opnfv/functest/conf/openstack.creds ...") - ft_constants.OPENSTACK_CREDS = \ - "/home/opnfv/functest/conf/openstack.creds" + os.path.join(ft_constants.FUNCTEST_CONF_DIR, 'openstack.creds') if not os.path.isfile(ft_constants.OPENSTACK_CREDS): logger.info("RC file not provided. " |