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 settings macro for kafkaproducer
[releng/builder.git]
/
scripts
/
jjb-init-project.py
diff --git
a/scripts/jjb-init-project.py
b/scripts/jjb-init-project.py
index a5df316dac840145fcdef7abb28d57dc2aebe81d..a7143aa77540bd3e78426597bb52c011be8af9f2 100644
(file)
--- a/
scripts/jjb-init-project.py
+++ b/
scripts/jjb-init-project.py
@@
-57,7
+57,7
@@
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 += ",validate-autorelease" # Autorelease validate template
templates += ",clm" # ensure we always create a clm job for all projects
templates += ",validate-autorelease" # Autorelease validate template
@@
-85,9
+85,11
@@
for stream, options in streams.items():
str_streams += " - %s\n" % jdk.strip()
# Disable autorelease validate job unless project is participating
str_streams += " - %s\n" % jdk.strip()
# Disable autorelease validate job unless project is participating
- # in autorelease
- str_streams += " autorelease: %s\n" % options.get(
- "autorelease", False)
+ # 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 #
@@
-150,13
+152,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 #