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
/
didm
/
didm.yaml
diff --git
a/jjb/didm/didm.yaml
b/jjb/didm/didm.yaml
index b3b7910e3cfb9e43ebad694008c829744181d27a..037ebc6bebd2e6219ec8a19d74b50c2ccf33435d 100644
(file)
--- a/
jjb/didm/didm.yaml
+++ b/
jjb/didm/didm.yaml
@@
-3,25
+3,16
@@
name: didm-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: didm-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: 'didm'
project-name: 'didm'
branch: 'master'
stream: oxygen
project: 'didm'
project-name: 'didm'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'didm-settings'
mvn-settings: 'didm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96e6338c870f5
# Used by the release job
staging-profile-id: 96e6338c870f5
@@
-30,25
+21,16
@@
name: didm-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: didm-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: 'didm'
project-name: 'didm'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'didm'
project-name: 'didm'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'didm-settings'
mvn-settings: 'didm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96e6338c870f5
# Used by the release job
staging-profile-id: 96e6338c870f5
@@
-57,26
+39,17
@@
name: didm-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: didm-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: 'didm'
project-name: 'didm'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'didm'
project-name: 'didm'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'didm-settings'
mvn-settings: 'didm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[didm]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96e6338c870f5
# Used by the release job
staging-profile-id: 96e6338c870f5
@@
-84,10
+57,9
@@
- project:
name: didm-sonar
jobs:
- project:
name: didm-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'didm'
project-name: 'didm'
branch: 'master'
mvn-settings: 'didm-settings'
project: 'didm'
project-name: 'didm'
branch: 'master'
mvn-settings: 'didm-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'