X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=b878f8e4be5a6d77b545bab7f47d598bdcb1c736;hb=cae76102a44a238644fafa39d6f1c5d4199845bc;hp=417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b;hpb=8a6f538a5bcb04622ef0ce600e8dcb0df4f80c20;p=releng%2Fbuilder.git

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 417049d3b..b878f8e4b 100644
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -57,9 +57,7 @@ if os.path.isfile(project_conf):
 if cfg.get("JOB_TEMPLATES"):
     templates = cfg.get("JOB_TEMPLATES")
 else:
-    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
+    templates = ("")
 
 ##################
 # Handle Streams #
@@ -71,7 +69,7 @@ if cfg.get("STREAMS"):  # this is a list of single-key dicts
 else:
     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 +89,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 +119,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 ")
 
@@ -153,12 +154,7 @@ if dependencies:
 # Handle 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 #