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 "Remove of-config carbon jobs"
[releng/builder.git]
/
jjb
/
controller
/
controller.yaml
diff --git
a/jjb/controller/controller.yaml
b/jjb/controller/controller.yaml
index f422a322aba6716f7259bc0c8099a726858806b4..ed072791dddcb0bb7284e633261eb45403e77963 100644
(file)
--- a/
jjb/controller/controller.yaml
+++ b/
jjb/controller/controller.yaml
@@
-1,93
+1,78
@@
---
- project:
---
- project:
- name: controller-
nitrogen
+ name: controller-
fluorine
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
- stream:
nitrogen
+ stream:
fluorine
project: 'controller'
project-name: 'controller'
branch: 'master'
project: 'controller'
project-name: 'controller'
branch: 'master'
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'controller-settings'
mvn-settings: 'controller-settings'
- mvn-goals: 'clean
install
-Pintegrationtests,docs'
+ mvn-goals: 'clean
deploy
-Pintegrationtests,docs'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+ build-node: centos7-builder-8c-8g
+ build-timeout: 90
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96c1c9177efdd
- project:
- project:
- name: controller-
carbo
n
+ name: controller-
oxyge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
- stream:
carbo
n
+ stream:
oxyge
n
project: 'controller'
project-name: 'controller'
project: 'controller'
project-name: 'controller'
- branch: 'stable/carbon'
- karaf-version: karaf3
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/oxygen'
mvn-settings: 'controller-settings'
mvn-settings: 'controller-settings'
- mvn-goals: 'clean
install
-Pintegrationtests,docs'
+ mvn-goals: 'clean
deploy
-Pintegrationtests,docs'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+ build-node: centos7-builder-8c-8g
+ build-timeout: 90
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96c1c9177efdd
- project:
- project:
- name: controller-
boro
n
+ name: controller-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{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}'
+ - odl-maven-jobs
- stream:
boro
n
+ stream:
nitroge
n
project: 'controller'
project-name: 'controller'
project: 'controller'
project-name: 'controller'
- branch: 'stable/boron'
- karaf-version: karaf3
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/nitrogen'
mvn-settings: 'controller-settings'
mvn-settings: 'controller-settings'
- mvn-goals: 'clean
install
-Pintegrationtests,docs'
+ mvn-goals: 'clean
deploy
-Pintegrationtests,docs'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+ build-node: centos7-builder-8c-8g
+ build-timeout: 90
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96c1c9177efdd
- project:
name: controller-sonar
jobs:
- project:
name: controller-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'controller'
project-name: 'controller'
branch: master
project: 'controller'
project-name: 'controller'
branch: master
+ build-node: centos7-builder-8c-8g
mvn-settings: 'controller-settings'
mvn-settings: 'controller-settings'
- mvn-goals: 'clean
install
-Pintegrationtests,docs'
+ mvn-goals: 'clean
deploy
-Pintegrationtests,docs'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'