From 080d9b094fad5d9cfc2a8054a42f604fe2d5ba6c Mon Sep 17 00:00:00 2001
From: Zack Galbreath <zack.galbreath@kitware.com>
Date: Thu, 15 Apr 2021 17:11:08 -0400
Subject: [PATCH] Return non-zero from CDash reporter when errors are detected
 (#22962)

---
 lib/spack/spack/reporters/cdash.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py
index 44d3f7b78d4..7adee52917c 100644
--- a/lib/spack/spack/reporters/cdash.py
+++ b/lib/spack/spack/reporters/cdash.py
@@ -22,6 +22,7 @@
 import spack.build_environment
 import spack.fetch_strategy
 import spack.package
+from spack.error import SpackError
 from spack.reporter import Reporter
 from spack.util.crypto import checksum
 from spack.util.executable import which
@@ -60,6 +61,7 @@ class CDash(Reporter):
     def __init__(self, args):
         Reporter.__init__(self, args)
         tty.set_verbose(args.verbose)
+        self.success = True
         self.template_dir = os.path.join('reports', 'cdash')
         self.cdash_upload_url = args.cdash_upload_url
 
@@ -166,6 +168,7 @@ def build_report_for_package(self, directory_name, package, duration):
 
             if phase == 'configure' and nerrors > 0:
                 report_data[phase]['status'] = 1
+                self.success = False
 
             if phase == 'build':
                 # Convert log output from ASCII to Unicode and escape for XML.
@@ -190,6 +193,8 @@ def clean_log_event(event):
                 if package['result'] == 'success':
                     warnings = errors + warnings
                     errors = []
+                else:
+                    self.success = False
 
                 report_data[phase]['errors'] = []
                 report_data[phase]['warnings'] = []
@@ -254,7 +259,7 @@ def build_report(self, directory_name, input_data):
             for package in spec['packages']:
                 self.build_report_for_package(
                     directory_name, package, duration)
-        self.print_cdash_link()
+        self.finalize_report()
 
     def test_report_for_package(self, directory_name, package, duration):
         if 'stdout' not in package:
@@ -360,7 +365,7 @@ def test_report(self, directory_name, input_data):
             for package in spec['packages']:
                 self.test_report_for_package(
                     directory_name, package, duration)
-        self.print_cdash_link()
+        self.finalize_report()
 
     def concretization_report(self, directory_name, msg):
         self.buildname = self.base_buildname
@@ -381,7 +386,8 @@ def concretization_report(self, directory_name, msg):
         # errors so refer to this report with the base buildname instead.
         self.current_package_name = self.base_buildname
         self.upload(output_filename)
-        self.print_cdash_link()
+        self.success = False
+        self.finalize_report()
 
     def initialize_report(self, directory_name):
         if not os.path.exists(directory_name):
@@ -430,7 +436,7 @@ def upload(self, filename):
                     buildid = match.group(1)
                     self.buildIds[self.current_package_name] = buildid
 
-    def print_cdash_link(self):
+    def finalize_report(self):
         if self.buildIds:
             print("View your build results here:")
             for package_name, buildid in iteritems(self.buildIds):
@@ -440,3 +446,5 @@ def print_cdash_link(self):
                 build_url = build_url[0:build_url.find("submit.php")]
                 build_url += "buildSummary.php?buildid={0}".format(buildid)
                 print("{0}: {1}".format(package_name, build_url))
+        if not self.success:
+            raise SpackError("Errors encountered, see above for more details")