diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py index 04a2cc2227..a3ffed06bb 100644 --- a/tests/unit/test_connection.py +++ b/tests/unit/test_connection.py @@ -160,11 +160,7 @@ class TestSQLConnection(ZuulDBTestCase): # Check the first result, which should be the project-merge job self.assertEqual('project-merge', buildset0_builds[0]['job_name']) self.assertEqual("SUCCESS", buildset0_builds[0]['result']) - self.assertEqual( - 'finger://{hostname}/{uuid}'.format( - hostname=self.executor_server.hostname, - uuid=buildset0_builds[0]['uuid']), - buildset0_builds[0]['log_url']) + self.assertEqual(None, buildset0_builds[0]['log_url']) self.assertEqual('check', buildset1['pipeline']) self.assertEqual('master', buildset1['branch']) self.assertEqual('org/project', buildset1['project']) @@ -184,11 +180,7 @@ class TestSQLConnection(ZuulDBTestCase): # which failed self.assertEqual('project-test1', buildset1_builds[1]['job_name']) self.assertEqual("FAILURE", buildset1_builds[1]['result']) - self.assertEqual( - 'finger://{hostname}/{uuid}'.format( - hostname=self.executor_server.hostname, - uuid=buildset1_builds[1]['uuid']), - buildset1_builds[1]['log_url']) + self.assertEqual(None, buildset1_builds[1]['log_url']) buildset2_builds = conn.execute( sa.sql.select([reporter.connection.zuul_build_table]).where( diff --git a/zuul/driver/sql/sqlreporter.py b/zuul/driver/sql/sqlreporter.py index c757d83f0c..c018a01f3e 100644 --- a/zuul/driver/sql/sqlreporter.py +++ b/zuul/driver/sql/sqlreporter.py @@ -66,6 +66,9 @@ class SQLReporter(BaseReporter): build.end_time = time.time() (result, url) = item.formatJobResult(job) + log_url = build.result_data.get('zuul', {}).get('log_url') + if log_url and log_url[-1] != '/': + log_url = log_url + '/' start = end = None if build.start_time: start = datetime.datetime.fromtimestamp( @@ -83,7 +86,7 @@ class SQLReporter(BaseReporter): start_time=start, end_time=end, voting=build.job.voting, - log_url=url, + log_url=log_url, node_name=build.node_name, )