Merge "Added job definition for scaling tests."

[releng/builder.git] / scripts / jjb-init-project.py

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index dfb20299e406d23026e87370769e339bab665462..57ad0ceddc0c6aba7de02d1c12657eca19b364b2 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -59,6 +59,7 @@ if 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
 
 ##################
 # 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 #
 ###############
@@ -130,13 +138,16 @@ 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 #