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 "Move netvirt jobs to netvirt"
[releng/builder.git]
/
jjb
/
docs
/
docs.yaml
diff --git
a/jjb/docs/docs.yaml
b/jjb/docs/docs.yaml
index 0a825d32b8a285b46e05062f9d0ab2e8ea5fbca7..cb47308a5a49ccde819536dd4ae2d197a6648cc8 100644
(file)
--- a/
jjb/docs/docs.yaml
+++ b/
jjb/docs/docs.yaml
@@
-85,9
+85,9
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
+ - gerrit-parameters:
+ project: '{project}'
branch: '{branch}'
branch: '{branch}'
- - gerrit-refspec-parameter:
refspec: 'refs/heads/{branch}'
scm:
refspec: 'refs/heads/{branch}'
scm:
@@
-155,9
+155,9
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
+ - gerrit-parameters:
+ project: '{project}'
branch: '{branch}'
branch: '{branch}'
- - gerrit-refspec-parameter:
refspec: 'refs/heads/{branch}'
scm:
refspec: 'refs/heads/{branch}'
scm:
@@
-384,10
+384,10
@@
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
- - gerrit-p
roject-parameter
:
+ - gerrit-p
arameters
:
project: '{project}'
project: '{project}'
- - gerrit-refspec-parameter:
- refspec: '{branch}'
+ branch: '{branch}'
+ refspec: '
refs/heads/
{branch}'
- project-parameter:
project: '{project}'
- integration-distribution-git-url
- project-parameter:
project: '{project}'
- integration-distribution-git-url
@@
-440,7
+440,7
@@
- maven-target:
maven-version: '{mvn33}'
pom: '$GERRIT_PROJECT/pom.xml'
- maven-target:
maven-version: '{mvn33}'
pom: '$GERRIT_PROJECT/pom.xml'
- goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+ goals: 'clean install -
B -
Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: '{docs-settings}'
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: '{docs-settings}'
@@
-449,8
+449,8
@@
maven:
maven-name: '{mvn33}'
root-pom: 'distribution/pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'distribution/pom.xml'
- goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
- maven-opts: '-
B -
Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+ goals: 'clean install -
B -
Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: '{docs-settings}'
global-settings: '{odl-global-settings}'
ignore-upstream-changes: true
settings: '{docs-settings}'
global-settings: '{odl-global-settings}'
ignore-upstream-changes: true
@@
-670,8
+670,10
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
+ - gerrit-parameters:
+ project: '{project}'
branch: '{branch}'
branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
- autorelease-release-tag:
release-tag: 'validate'
- autorelease-release-branch:
- autorelease-release-tag:
release-tag: 'validate'
- autorelease-release-branch:
@@
-690,7
+692,6
@@
branches:
- 'origin/{branch}'
skip-tag: true
branches:
- 'origin/{branch}'
skip-tag: true
- shallow-clone: true
submodule:
recursive: true
timeout: 15
submodule:
recursive: true
timeout: 15
@@
-734,7
+735,7
@@
- maven-target:
maven-version: '{mvn33}'
pom: validate-pom.xml
- maven-target:
maven-version: '{mvn33}'
pom: validate-pom.xml
- goals: 'clean install -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ goals: 'clean install -
B -
T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
java-opts:
- '-Xmx8g'
settings: '{autorelease-settings}'
java-opts:
- '-Xmx8g'
settings: '{autorelease-settings}'
@@
-743,8
+744,8
@@
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
- goals: 'clean validate -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
- maven-opts: '-
B -
Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+ goals: 'clean validate -
B -
Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: '{autorelease-settings}'
global-settings: '{odl-global-settings}'
automatic-archiving: false
settings: '{autorelease-settings}'
global-settings: '{odl-global-settings}'
automatic-archiving: false