Merge "Ensure surefire output is always archived"

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 541065679e6a7423ce8d01f10565340817e0a4e6..a7143aa77540bd3e78426597bb52c011be8af9f2 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -152,13 +152,13 @@ if dependencies:
 ############################
 # Handle ARCHIVE_ARTIFACTS #
 ############################
-if cfg.get('ARCHIVE_ARTIFACTS'):
-    archive_artifacts = cfg.get('ARCHIVE_ARTIFACTS')
-    archive_artifacts = ("- archive-artifacts:\n"
-                         "            artifacts: '%s'" % archive_artifacts)
-else:
-    archive_artifacts = ""
 
+always_archive = "**/target/surefire-reports/*-output.txt"
+
+archive_artifacts = cfg.get('ARCHIVE_ARTIFACTS', '')
+archive_artifacts = ("- archive-artifacts:\n"
+                     "            artifacts: '%s, %s'" %
+                     (always_archive, archive_artifacts))
 
 ##############################
 # Create configuration start #