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 "Increase timeout for jjb jobs to 60"
[releng/builder.git]
/
jjb
/
usc
/
usc.yaml
diff --git
a/jjb/usc/usc.yaml
b/jjb/usc/usc.yaml
index 8e6fc58f9f3e3aea9b8279b8e4217944504f24f5..86b4017fef51d6c38652123f26ac34f79140b756 100644
(file)
--- a/
jjb/usc/usc.yaml
+++ b/
jjb/usc/usc.yaml
@@
-1,20
+1,16
@@
---
- project:
---
- project:
- name: usc-
nitro
gen
+ name: usc-
oxy
gen
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-distribution3-check-nitrogen'
- '{project-name}-integration-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
- stream:
nitro
gen
+ stream:
oxy
gen
project: 'usc'
project-name: 'usc'
branch: 'master'
project: 'usc'
project-name: 'usc'
branch: 'master'
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-27,22
+23,21
@@
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a697b633b3ffe
+
- project:
- project:
- name: usc-
carbo
n
+ name: usc-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
- stream:
carbo
n
+ stream:
nitroge
n
project: 'usc'
project-name: 'usc'
project: 'usc'
project-name: 'usc'
- branch: 'stable/carbon'
- karaf-version: karaf3
- jdk: openjdk8
+ branch: 'stable/nitrogen'
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-55,22
+50,22
@@
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a697b633b3ffe
+
- project:
- project:
- name: usc-
bor
on
+ name: usc-
carb
on
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
- stream:
bor
on
+ stream:
carb
on
project: 'usc'
project-name: 'usc'
project: 'usc'
project-name: 'usc'
- branch: 'stable/
bor
on'
+ branch: 'stable/
carb
on'
karaf-version: karaf3
karaf-version: karaf3
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-83,10
+78,13
@@
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
email-upstream: '[usc] [controller] [yangtools] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a697b633b3ffe
+
- 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'