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
Remove {project}-integration-{stream} jobs
[releng/builder.git]
/
jjb
/
iotdm
/
iotdm.yaml
diff --git
a/jjb/iotdm/iotdm.yaml
b/jjb/iotdm/iotdm.yaml
index 30ecd8b5528d5a104b28bf21fa373a338d8b96ea..ed5b2d0aacee537127549ac1ef4c90249ed843a0 100644
(file)
--- a/
jjb/iotdm/iotdm.yaml
+++ b/
jjb/iotdm/iotdm.yaml
@@
-3,25
+3,17
@@
name: iotdm-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: iotdm-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'iotdm'
project-name: 'iotdm'
branch: 'master'
stream: oxygen
project: 'iotdm'
project-name: 'iotdm'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'iotdm-settings'
mvn-settings: 'iotdm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fd6e9453970
# Used by the release job
staging-profile-id: 96fd6e9453970
@@
-30,25
+22,17
@@
name: iotdm-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: iotdm-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'iotdm'
project-name: 'iotdm'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'iotdm'
project-name: 'iotdm'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'iotdm-settings'
mvn-settings: 'iotdm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fd6e9453970
# Used by the release job
staging-profile-id: 96fd6e9453970
@@
-57,26
+41,18
@@
name: iotdm-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: iotdm-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'iotdm'
project-name: 'iotdm'
branch: 'stable/carbon'
stream: carbon
project: 'iotdm'
project-name: 'iotdm'
branch: 'stable/carbon'
+ build-node: centos7-builder-2c-8g
karaf-version: karaf3
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'iotdm-settings'
mvn-settings: 'iotdm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'aaa-merge-{stream}'
email-upstream: '[iotdm] [aaa]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fd6e9453970
# Used by the release job
staging-profile-id: 96fd6e9453970
@@
-84,10
+60,10
@@
- project:
name: iotdm-sonar
jobs:
- project:
name: iotdm-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'iotdm'
project-name: 'iotdm'
branch: 'master'
project: 'iotdm'
project-name: 'iotdm'
branch: 'master'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'iotdm-settings'
mvn-settings: 'iotdm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'