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 ARCHIVE_ARTIFACTS overwrite
[releng/builder.git]
/
jjb
/
next
/
next.yaml
diff --git
a/jjb/next/next.yaml
b/jjb/next/next.yaml
index e31e11ac8e8f87ee9fd9913948021868eac21d65..6d7916b305fb652a2949542a6891f46e3c45fd15 100644
(file)
--- a/
jjb/next/next.yaml
+++ b/
jjb/next/next.yaml
@@
-4,24
+4,16
@@
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}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'next'
project-name: 'next'
branch: 'master'
stream: oxygen
project: 'next'
project-name: 'next'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'next-settings'
mvn-settings: 'next-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: a67e7c516f385
# Used by the release job
staging-profile-id: a67e7c516f385
@@
-31,24
+23,16
@@
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}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'next'
project-name: 'next'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'next'
project-name: 'next'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'next-settings'
mvn-settings: 'next-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: a67e7c516f385
# Used by the release job
staging-profile-id: a67e7c516f385
@@
-58,25
+42,17
@@
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}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'next'
project-name: 'next'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'next'
project-name: 'next'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'next-settings'
mvn-settings: 'next-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[next]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: a67e7c516f385
# Used by the release job
staging-profile-id: a67e7c516f385
@@
-84,10
+60,9
@@
- project:
name: next-sonar
jobs:
- project:
name: next-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'next'
project-name: 'next'
branch: 'master'
project: 'next'
project-name: 'next'
branch: 'master'
- mvn-settings: 'tsdr-settings'
- mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+ mvn-settings: 'next-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'