BUG-2625: validate alto using jdk8 only

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

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index a5df316dac840145fcdef7abb28d57dc2aebe81d..417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,7 +57,7 @@ if os.path.isfile(project_conf):
 if cfg.get("JOB_TEMPLATES"):
     templates = cfg.get("JOB_TEMPLATES")
 else:
-    templates = "verify,merge,daily,distribution,integration,sonar"
+    templates = "verify,merge,periodic,distribution,integration,sonar"
 templates += ",clm"  # ensure we always create a clm job for all projects
 templates += ",validate-autorelease"  # Autorelease validate template
 
@@ -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"]
@@ -85,9 +85,11 @@ for stream, options in streams.items():
         str_streams += "                - %s\n" % jdk.strip()
 
     # Disable autorelease validate job unless project is participating
-    # in autorelease
-    str_streams += "            autorelease: %s\n" % options.get(
-        "autorelease", False)
+    # in autorelease, JJB does not allow flipping a boolean so we have to
+    # flip it here via not operator since the JJB configuration for disabling
+    # a Jenkins Job is "disabled: bool".
+    str_streams += "            disable_autorelease: %s\n" % (not options.get(
+        "autorelease", False))
 
 ###############
 # Handle JDKS #
@@ -150,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 #