X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=2595e38594822b433aa5ed49a0ab80f151f28488;hb=09703942f85f4df7aa90b8cf5fab213f6e857c8a;hp=dfb20299e406d23026e87370769e339bab665462;hpb=2091dd357bf42105974dbe11f4b98115152a6ccb;p=releng%2Fbuilder.git

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index dfb20299e..2595e3859 100644
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,8 +57,11 @@ 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,distribution-check,integration,"
+        "sonar")
 templates += ",clm"  # ensure we always create a clm job for all projects
+templates += ",validate-autorelease"  # Autorelease validate template
 
 ##################
 # Handle Streams #
@@ -68,9 +71,9 @@ 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.
+first_stream = next(iter(streams))  # Keep master branch at top.
 sonar_branch = streams[first_stream]["branch"]
 # Create YAML to list branches to create jobs for
 str_streams = "stream:\n"
@@ -83,6 +86,17 @@ 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))
+
+    # Disable the distribution-check job unless project enables it
+    str_streams += "            disable_distribution_check: %s\n" % (
+        not options.get("distribution-check", True))
+
 ###############
 # Handle JDKS #
 ###############
@@ -130,24 +144,27 @@ if cfg.get('DEPENDENCIES'):
         dependencies = "odlparent," + dependencies
     disabled = "false"
 else:
-    dependencies = "odlparent"  # All projects depend on odlparent
+    dependencies = None
+    if project.project != "odlparent":  # Odlparent does not depend on itself
+        dependencies = "odlparent"  # All other projects depend on odlparent
     disabled = "false"
 
-email_prefix = (email_prefix + " " +
+if dependencies:
+    email_prefix = (email_prefix + " " +
                 " ".join(['[%s]' % d for d in dependencies.split(",")]))  # noqa
-dependent_jobs = ",".join(
-    ['%s-merge-{stream}' % d for d in dependencies.split(",")])
+    dependent_jobs = ",".join(
+        ['%s-merge-{stream}' % d for d in dependencies.split(",")])
 
 ############################
 # 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 #