X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=a7143aa77540bd3e78426597bb52c011be8af9f2;hb=2271ec0daa14b03b25359c7dd5f8933dcad88c84;hp=2133475a4ff9e1f4b18cc288654a4dc050bf808f;hpb=4a8ab2252b467c8901178c58f1e8b498fcc6ced6;p=releng%2Fbuilder.git

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 2133475a4..a7143aa77 100644
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,8 +57,9 @@ 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
 
 ##################
 # Handle Streams #
@@ -83,6 +84,13 @@ for stream, options in streams.items():
     for jdk in options["jdks"].split(","):
         str_streams += "                - %s\n" % jdk.strip()
 
+    # Disable autorelease validate job unless project is participating
+    # 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 #
 ###############
@@ -144,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 #