X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=8b891f18d4bec1a124027eea816430e18a49d45f;hb=5cf5961a3b764c82fbc22d1a03e6bff1aedbb7b5;hp=57ad0ceddc0c6aba7de02d1c12657eca19b364b2;hpb=c6d3b580a0b18844489e2a3876540bb5a9476cb3;p=releng%2Fbuilder.git

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 57ad0cedd..8b891f18d 100644
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,9 +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 += ",clm"  # ensure we always create a clm job for all projects
-templates += ",validate-autorelease"  # Autorelease validate template
+    templates = (
+        "verify,merge,"
+        "sonar")
 
 ##################
 # Handle Streams #
@@ -69,9 +69,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"
@@ -91,6 +91,10 @@ for stream, options in streams.items():
     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 #
 ###############
@@ -117,7 +121,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 ")
 
@@ -152,13 +155,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 #