openstack/ci-log-processing
Code Issues Proposed changes

Merge "Try to always download build log files"

Browse Source
This commit is contained in:
Zuul
2023-05-30 10:20:33 +00:00
committed by Gerrit Code Review
parent e758de8426 36e124a197
commit 1e05c15ef6
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
logscraper/logscraper.py
View File

@@ -560,13 +560,6 @@ def download_file(url, directory, insecure, timeout):
logging.critical("Can not decode content from %s" % url)
def is_job_with_result(job_result):
results_with_status = ['failure', 'success', 'timed_out']
if (job_result["result"].lower() in results_with_status and
job_result["log_url"]):
return True
def create_custom_result(job_result, directory):
try:
with open("%s/custom-job-results.txt" % directory, "w") as f:
@@ -687,11 +680,11 @@ def run_build(build):
validate_ca = _verify_ca(args)
if is_job_with_result(build):
if 'log_url' in build and build["log_url"]:
check_specified_files(build, validate_ca, args.timeout, directory)
else:
# NOTE: if build result is "ABORTED" or "NODE_FAILURE, there is
# no any job result files to parse, but we would like to have that
# NOTE: if build result does not contain 'log_url', so there is
# no result files to parse, but we would like to have that
# knowledge, so it will create own job-results.txt file that
# contains:
# build["end_time"] | build["result"]

2
logscraper/tests/test_logscraper.py
View File

@@ -440,7 +440,7 @@ class TestScraper(base.TestCase):
workers=1, download=True, directory="/tmp/testdir"))
def test_run_aborted_download(self, mock_args, mock_gear, mock_gear_client,
mock_check_files, mock_custom_result):
# Take job result that build_status is "ABORTED" or "NODE_FAILURE"
# Take job result that log_url is empty.
result = builds_result[2]
result['files'] = ['job-output.txt']
result['tenant'] = 'sometenant'