Merge "BUG-2565: enable JDK8 verification for netide"

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

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index c2ec670407bb29ba7984b09783f1cd5932c9ca48..2133475a4ff9e1f4b18cc288654a4dc050bf808f 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -28,14 +28,18 @@ args = jjblib.parse_jjb_args()
 project = jjblib.Project(args.project)
 if project.meta_project is not None:
     project_dir = os.path.join("jjb", project.meta_project, project.project)
+    jenkins_settings = "%s-%s-settings" % (project.meta_project,
+                                           project.project)
 else:
     project_dir = os.path.join("jjb", project.project)
+    jenkins_settings = "%s-settings" % project.project
 
 project_file = os.path.join(project_dir, "%s.yaml" % project)
 dependent_jobs = ""
 disabled = "true"   # Always disabled unless project has dependencies
 email_prefix = "[%s]" % project
 
+
 if not args.conf:
     jjblib.create_template_config(project_dir, args)
     project_conf = os.path.join(project_dir, "%s.cfg" % args.project)
@@ -126,13 +130,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 #
@@ -187,7 +194,9 @@ with open(project_file, "w") as outfile:
             for line in infile:
                 if not re.match("\s*#", line):
                     line = re.sub("JOB_TEMPLATES", job_templates_yaml, line)
-                    line = re.sub("PROJECT", project.project, line)
+                    line = re.sub("PROJECT_SHORTNAME", project.project, line)
+                    line = re.sub("PROJECT_PATH", project.path, line)
+                    line = re.sub("JENKINS_SETTINGS", jenkins_settings, line)
                     line = re.sub("DISABLED", disabled, line)
                     line = re.sub("STREAMS", str_streams, line)
                     line = re.sub("POM", pom, line)