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
Add ocpplugin.cfg and ocpplugin.yaml to review
[releng/builder.git]
/
scripts
/
jjb-init-project.py
diff --git
a/scripts/jjb-init-project.py
b/scripts/jjb-init-project.py
index 57ad0ceddc0c6aba7de02d1c12657eca19b364b2..2595e38594822b433aa5ed49a0ab80f151f28488 100644
(file)
--- a/
scripts/jjb-init-project.py
+++ b/
scripts/jjb-init-project.py
@@
-57,7
+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,distribution-check,integration,"
+ "sonar")
templates += ",clm" # ensure we always create a clm job for all projects
templates += ",validate-autorelease" # Autorelease validate template
templates += ",clm" # ensure we always create a clm job for all projects
templates += ",validate-autorelease" # Autorelease validate template
@@
-69,9
+71,9
@@
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.
+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"
sonar_branch = streams[first_stream]["branch"]
# Create YAML to list branches to create jobs for
str_streams = "stream:\n"
@@
-91,6
+93,10
@@
for stream, options in streams.items():
str_streams += " disable_autorelease: %s\n" % (not options.get(
"autorelease", False))
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 #
###############
###############
# Handle JDKS #
###############
@@
-152,13
+158,13
@@
if dependencies:
############################
# 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 #