X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjb-init-project.py;h=f9273c88a5235dda6df1cead779249a8db5436a4;hb=453f92fb83a3c58b99ea3714056dc895abcdcc7f;hp=c2ec670407bb29ba7984b09783f1cd5932c9ca48;hpb=cc052ad9de9dfedc76fad5154fad92b70eca7794;p=releng%2Fbuilder.git diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py index c2ec67040..f9273c88a 100644 --- 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) @@ -188,6 +192,7 @@ with open(project_file, "w") as outfile: 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("JENKINS_SETTINGS", jenkins_settings, line) line = re.sub("DISABLED", disabled, line) line = re.sub("STREAMS", str_streams, line) line = re.sub("POM", pom, line)