diff --git a/libtaskotron/directives/resultsdb_directive.py b/libtaskotron/directives/resultsdb_directive.py --- a/libtaskotron/directives/resultsdb_directive.py +++ b/libtaskotron/directives/resultsdb_directive.py @@ -103,7 +103,6 @@ from libtaskotron import check from libtaskotron import config -from libtaskotron import buildbot_utils from libtaskotron.exceptions import TaskotronDirectiveError, TaskotronValueError from libtaskotron.logger import log from libtaskotron.ext.fedora import rpm_utils @@ -279,26 +278,22 @@ return check.export_YAML(check_details) checkname = '%s.%s' % (arg_data['namespace'], arg_data['checkname']) + artifactsdir_url = '%s/all/%s' % (self.artifacts_baseurl, arg_data['uuid']) # find out if the task is allowed to post results into the namespace if config.get_config().profile == config.ProfileName.PRODUCTION: self.check_namespace(checkname, arg_data) # for now, we're creating the resultsdb group at reporting time - _, log_url = buildbot_utils.get_urls(arg_data['jobid'], - self.masterurl, - self.task_stepname) - artifactsdir_url = '%s/all/%s' % (self.artifacts_baseurl, arg_data['uuid']) - group_data = self.create_resultsdb_group(uuid=arg_data['uuid'], name=checkname) log.info('Posting %s results to ResultsDB...' % len(check_details)) for detail in check_details: checkname = '%s.%s' % (arg_data['namespace'], detail.checkname or arg_data['checkname']) self.ensure_testcase_exists(checkname) - result_log_url = log_url + result_log_url = artifactsdir_url if detail.artifact: artifact_path = self.get_artifact_path( arg_data['artifactsdir'], diff --git a/testing/functest_resultsdb_directive.py b/testing/functest_resultsdb_directive.py --- a/testing/functest_resultsdb_directive.py +++ b/testing/functest_resultsdb_directive.py @@ -105,10 +105,7 @@ call_data = call[2] # the log url depends on the arg_data, so construct it here - ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') - ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ - (self.conf.taskotron_master, ref_builder, ref_jobid, - self.conf.buildbot_task_step) + ref_log_url = '%s/all/%s' % (self.conf.artifacts_baseurl, self.ref_arg_data['uuid']) ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], self.ref_arg_data['checkname']) diff --git a/testing/test_resultsdb_directive.py b/testing/test_resultsdb_directive.py --- a/testing/test_resultsdb_directive.py +++ b/testing/test_resultsdb_directive.py @@ -153,10 +153,7 @@ call_data = call[2] # the log url depends on the arg_data, so construct it here - ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') - ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ - (self.conf.taskotron_master, ref_builder, ref_jobid, - self.conf.buildbot_task_step) + ref_log_url = '%s/all/%s' % (self.conf.artifacts_baseurl, self.ref_arg_data['uuid']) ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], self.ref_arg_data['checkname'])