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 "Install Openstack Clients Before Test"
[releng/builder.git]
/
jjb
/
usc
/
usc.yaml
diff --git
a/jjb/usc/usc.yaml
b/jjb/usc/usc.yaml
index e7db1e18df684c856a47dbb025b603ca6c71d62e..86b4017fef51d6c38652123f26ac34f79140b756 100644
(file)
--- a/
jjb/usc/usc.yaml
+++ b/
jjb/usc/usc.yaml
@@
-4,9
+4,8
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: oxygen
project: 'usc'
stream: oxygen
project: 'usc'
@@
-32,9
+31,8
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: nitrogen
project: 'usc'
stream: nitrogen
project: 'usc'
@@
-60,9
+58,8
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: carbon
project: 'usc'
stream: carbon
project: 'usc'
@@
-87,7
+84,7
@@
- project:
name: usc-sonar
jobs:
- project:
name: usc-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'usc'
project-name: 'usc'
branch: 'master'
project: 'usc'
project-name: 'usc'
branch: 'master'