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 "Switch all projects to use new maven-merge job"
[releng/builder.git]
/
jjb
/
ofextensions
/
circuitsw
/
circuitsw.yaml
diff --git
a/jjb/ofextensions/circuitsw/circuitsw.yaml
b/jjb/ofextensions/circuitsw/circuitsw.yaml
index f4784289fc0b310b1b9438563d08d74f2c2b47fa..1f892da2846febce78094d72240097ae54230da6 100644
(file)
--- a/
jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/
jjb/ofextensions/circuitsw/circuitsw.yaml
@@
-4,7
+4,6
@@
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
stream: oxygen
project: 'ofextensions/circuitsw'
stream: oxygen
project: 'ofextensions/circuitsw'
@@
-30,7
+29,6
@@
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
stream: nitrogen
project: 'ofextensions/circuitsw'
stream: nitrogen
project: 'ofextensions/circuitsw'
@@
-56,7
+54,6
@@
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
jobs:
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
stream: carbon
project: 'ofextensions/circuitsw'
stream: carbon
project: 'ofextensions/circuitsw'
@@
-80,7
+77,7
@@
- project:
name: circuitsw-sonar
jobs:
- project:
name: circuitsw-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'ofextensions/circuitsw'
project-name: 'circuitsw'
branch: 'master'
project: 'ofextensions/circuitsw'
project-name: 'circuitsw'
branch: 'master'