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
Convert CLM job to regular JJB template
[releng/builder.git]
/
scripts
/
jjb-init-project.py
diff --git
a/scripts/jjb-init-project.py
b/scripts/jjb-init-project.py
index 417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b..b33e7183b7dbab4bca9366b897cf9715f9e43859 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,periodic,distribution,integration,sonar"
-templates += ",clm" # ensure we always create a clm job for all projects
+ templates = (
+ "verify,merge,periodic,distribution,distribution-check,integration,"
+ "sonar")
templates += ",validate-autorelease" # Autorelease validate template
##################
templates += ",validate-autorelease" # Autorelease validate template
##################
@@
-71,7
+72,7
@@
if cfg.get("STREAMS"): # this is a list of single-key dicts
else:
streams = {"boron": jjblib.STREAM_DEFAULTS["boron"]}
else:
streams = {"boron": 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
+92,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 #
###############
@@
-117,7
+122,6
@@
if cfg.get('MVN_GOALS'):
mvn_goals = cfg.get('MVN_GOALS')
else:
mvn_goals = ("clean install "
mvn_goals = cfg.get('MVN_GOALS')
else:
mvn_goals = ("clean install "
- "-V " # Show Maven / Java version before building
"-Dmaven.repo.local=/tmp/r "
"-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r ")
"-Dmaven.repo.local=/tmp/r "
"-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r ")