X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=233ff88e5889f3721a7a4f237a28297d015db841;hb=f963acd7a1818e72109a3e409d1b4f95ef6a030b;hp=d4bb6d0374ae09f3d1ca72609bb7f9a1315a0ece;hpb=1e9d7d1602a1e883cb7ec3e58be46a40496d4b21;p=releng%2Fbuilder.git

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index d4bb6d037..233ff88e5 100644
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,11 +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
-
-if cfg.get("AUTORELEASE"):
-    templates += ",validate-autorelease"
+templates += ",validate-autorelease"  # Autorelease validate template
 
 ##################
 # Handle Streams #
@@ -71,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"
@@ -86,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 #
 ###############
@@ -112,7 +123,6 @@ if cfg.get('MVN_GOALS'):
     mvn_goals = cfg.get('MVN_GOALS')
 else:
     mvn_goals = ("clean install "
-                 "-V "  # Show Maven / Java version before building
                  "-Dmaven.repo.local=/tmp/r "
                  "-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r ")
 
@@ -147,13 +157,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 #