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
Merge "Adding instructions on setting up gpg-agent on a Mac"
[releng/builder.git]
/
scripts
/
jjb-init-project.py
diff --git
a/scripts/jjb-init-project.py
b/scripts/jjb-init-project.py
index 64b58210731b60bd8dd0124a8f909c6bb78b4a55..233ff88e5889f3721a7a4f237a28297d015db841 100644
(file)
--- a/
scripts/jjb-init-project.py
+++ b/
scripts/jjb-init-project.py
@@
-73,7
+73,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"
@@
-123,7
+123,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 ")