Move "no results server" warning

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/report.py b/teuthology/report.py
index 2325fadb641d00f00167402e5710a3876200c09c..9a80840dc2ef502b335a1eafec768c804caff032 100644 (file)
--- a/teuthology/report.py
+++ b/teuthology/report.py
@@ -179,11 +179,16 @@ class ResultsReporter(object):
         self.base_uri = base_uri or config.results_server
         if self.base_uri:
             self.base_uri = self.base_uri.rstrip('/')
+
         self.serializer = ResultsSerializer(archive_base, log=self.log)
         self.save_last_run = save
         self.refresh = refresh
         self.session = self._make_session()
 
+        if not self.base_uri:
+            msg = "No results_server set in {yaml}; cannot report results"
+            log.warn(msg.format(yaml=config.teuthology_yaml))
+
     def _make_session(self, max_retries=10):
         session = requests.Session()
         adapter = requests.adapters.HTTPAdapter(max_retries=max_retries)
@@ -393,6 +398,8 @@ def push_job_info(run_name, job_id, job_info, base_uri=None):
                      ResultsReporter will ask teuthology.config.
     """
     reporter = ResultsReporter()
+    if not reporter.base_uri:
+        return
     reporter.report_job(run_name, job_id, job_info)
 
 
@@ -409,11 +416,7 @@ def try_push_job_info(job_config, extra_info=None):
     """
     log = init_logging()
 
-    if not config.results_server:
-        msg = "No results_server set in {yaml}; not attempting to push results"
-        log.debug(msg.format(yaml=config.teuthology_yaml))
-        return
-    elif job_config.get('job_id') is None:
+    if job_config.get('job_id') is None:
         log.warning('No job_id found; not reporting results')
         return
 
@@ -446,17 +449,14 @@ def try_delete_jobs(run_name, job_ids, delete_empty_run=True):
     """
     log = init_logging()
 
-    if not config.results_server:
-        msg = "No results_server set in {yaml}; not attempting to delete job"
-        log.debug(msg.format(yaml=config.teuthology_yaml))
-        return
-
     if isinstance(job_ids, int):
         job_ids = [str(job_ids)]
     elif isinstance(job_ids, basestring):
         job_ids = [job_ids]
 
     reporter = ResultsReporter()
+    if not reporter.base_uri:
+        return
 
     log.debug("Deleting jobs from {server}: {jobs}".format(
         server=config.results_server, jobs=str(job_ids)))