Add BUNDLE_URL Robot variable definition

[releng/builder.git] / scripts / jjb-init-project.py

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 541065679e6a7423ce8d01f10565340817e0a4e6..417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -69,7 +69,7 @@ if cfg.get("STREAMS"):  # this is a list of single-key dicts
     for stream_dict in cfg.get("STREAMS"):
         streams.update(stream_dict)
 else:
-    streams = {"beryllium": jjblib.STREAM_DEFAULTS["beryllium"]}
+    streams = {"boron": jjblib.STREAM_DEFAULTS["boron"]}
 
 first_stream = streams.iterkeys().next()  # Keep master branch at top.
 sonar_branch = streams[first_stream]["branch"]
@@ -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 #