Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Disable distribution-check job in Lithium and Helium streams
[releng/builder.git]
/
scripts
/
jjb-init-project.py
diff --git
a/scripts/jjb-init-project.py
b/scripts/jjb-init-project.py
index f9273c88a5235dda6df1cead779249a8db5436a4..417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b 100644
(file)
--- a/
scripts/jjb-init-project.py
+++ b/
scripts/jjb-init-project.py
@@
-57,8
+57,9
@@
if os.path.isfile(project_conf):
if cfg.get("JOB_TEMPLATES"):
templates = cfg.get("JOB_TEMPLATES")
else:
if cfg.get("JOB_TEMPLATES"):
templates = cfg.get("JOB_TEMPLATES")
else:
- templates = "verify,merge,
daily
,distribution,integration,sonar"
+ templates = "verify,merge,
periodic
,distribution,integration,sonar"
templates += ",clm" # ensure we always create a clm job for all projects
templates += ",clm" # ensure we always create a clm job for all projects
+templates += ",validate-autorelease" # Autorelease validate template
##################
# Handle Streams #
##################
# Handle Streams #
@@
-68,7
+69,7
@@
if cfg.get("STREAMS"): # this is a list of single-key dicts
for stream_dict in cfg.get("STREAMS"):
streams.update(stream_dict)
else:
for stream_dict in cfg.get("STREAMS"):
streams.update(stream_dict)
else:
- streams = {"b
eryllium": jjblib.STREAM_DEFAULTS["beryllium
"]}
+ streams = {"b
oron": jjblib.STREAM_DEFAULTS["boron
"]}
first_stream = streams.iterkeys().next() # Keep master branch at top.
sonar_branch = streams[first_stream]["branch"]
first_stream = streams.iterkeys().next() # Keep master branch at top.
sonar_branch = streams[first_stream]["branch"]
@@
-83,6
+84,13
@@
for stream, options in streams.items():
for jdk in options["jdks"].split(","):
str_streams += " - %s\n" % jdk.strip()
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 #
###############
###############
# Handle JDKS #
###############
@@
-130,24
+138,27
@@
if cfg.get('DEPENDENCIES'):
dependencies = "odlparent," + dependencies
disabled = "false"
else:
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"
disabled = "false"
-email_prefix = (email_prefix + " " +
+if dependencies:
+ email_prefix = (email_prefix + " " +
" ".join(['[%s]' % d for d in dependencies.split(",")])) # noqa
" ".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 #
############################
############################
# 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 #
##############################
# Create configuration start #
@@
-191,7
+202,8
@@
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)
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("JENKINS_SETTINGS", jenkins_settings, line)
line = re.sub("DISABLED", disabled, line)
line = re.sub("STREAMS", str_streams, line)