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
Simplify gerrit-parameters into one macro
[releng/builder.git]
/
jjb
/
neutron
/
neutron.yaml
diff --git
a/jjb/neutron/neutron.yaml
b/jjb/neutron/neutron.yaml
index d4e7b17081bba78000073433374b0963766acad3..b4c327450d915f589589ffa9cebf9e48c77e2b1c 100644
(file)
--- a/
jjb/neutron/neutron.yaml
+++ b/
jjb/neutron/neutron.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
@@
-419,6
+419,10
@@
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'test-distribution'
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'test-distribution'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
projects:
- project-compare-type: 'ANT'
project-pattern: '{name}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{name}'
@@
-436,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: '{neutron-settings}'
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: '{neutron-settings}'
@@
-445,7
+449,7
@@
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'
+ 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: '{neutron-settings}'
global-settings: '{odl-global-settings}'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: '{neutron-settings}'
global-settings: '{odl-global-settings}'
@@
-562,7
+566,7
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- - timed: '
@weekly
'
+ - timed: '
H H * * 6
'
- gerrit-trigger-patch-sonar:
name: 'neutron'
- gerrit-trigger-patch-sonar:
name: 'neutron'
@@
-623,7
+627,7
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- - timed: '
@weekly
'
+ - timed: '
H H * * 6
'
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
@@
-666,24
+670,31
@@
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:
release-branch: '{branch}'
- autorelease-release-datestamp:
datestamp: true
- autorelease-release-tag:
release-tag: 'validate'
- autorelease-release-branch:
release-branch: '{branch}'
- autorelease-release-datestamp:
datestamp: true
+ - string:
+ name: CLONE_URL
+ default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+ description: "Autorelease clone URL"
scm:
- git:
scm:
- git:
- url: '
https://git.opendaylight.org/gerrit/releng/autorelease
'
+ url: '
$CLONE_URL
'
refspec: ''
branches:
- 'origin/{branch}'
skip-tag: true
submodule:
recursive: true
refspec: ''
branches:
- 'origin/{branch}'
skip-tag: true
submodule:
recursive: true
+ timeout: 15
wrappers:
- autorelease-build-timeout
wrappers:
- autorelease-build-timeout
@@
-720,12
+731,11
@@
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- autorelease-checkout-gerrit-patch
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- autorelease-checkout-gerrit-patch
- - autorelease-generate-taglist
- autorelease-generate-release-patches
- maven-target:
maven-version: '{mvn33}'
pom: validate-pom.xml
- autorelease-generate-release-patches
- 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}'
@@
-734,7
+744,7
@@
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'
+ 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}'
maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: '{autorelease-settings}'
global-settings: '{odl-global-settings}'
@@
-742,12
+752,9
@@
post-step-run-condition: UNSTABLE
postbuilders:
post-step-run-condition: UNSTABLE
postbuilders:
- - shell: "./scripts/list-project-dependencies.sh"
- autorelease-sys-stats
publishers:
- autorelease-sys-stats
publishers:
- - archive-artifacts:
- artifacts: '*.log'
- email-notification:
email-prefix: '[autorelease] [neutron]'
- email-notification:
email-prefix: '[autorelease] [neutron]'