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
/
atrium
/
atrium.yaml
diff --git
a/jjb/atrium/atrium.yaml
b/jjb/atrium/atrium.yaml
index 7a9dad82bd555df5753aaff8492340c7e464c295..774cb25760ac6d8e4944dcc6fece52b1a14fcb62 100644
(file)
--- a/
jjb/atrium/atrium.yaml
+++ b/
jjb/atrium/atrium.yaml
@@
-1,79
+1,53
@@
---
- project:
---
- project:
- name: atrium-
oxygen
+ name: atrium-
fluorine
jobs:
jobs:
- - '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
- odl-maven-jobs
- stream:
oxygen
+ stream:
fluorine
project: 'atrium'
project-name: 'atrium'
branch: 'master'
project: 'atrium'
project-name: 'atrium'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
- project:
# Used by the release job
staging-profile-id: 9324f12310e6a
- project:
- name: atrium-
nitro
gen
+ name: atrium-
oxy
gen
jobs:
- '{project-name}-distribution-check-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
- odl-maven-jobs
- stream:
nitro
gen
+ stream:
oxy
gen
project: 'atrium'
project-name: 'atrium'
project: 'atrium'
project-name: 'atrium'
- branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/oxygen'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
- project:
# Used by the release job
staging-profile-id: 9324f12310e6a
- project:
- name: atrium-
carbo
n
+ name: atrium-
nitroge
n
jobs:
- '{project-name}-distribution-check-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
- odl-maven-jobs
- stream:
carbo
n
+ stream:
nitroge
n
project: 'atrium'
project-name: 'atrium'
project: 'atrium'
project-name: 'atrium'
- branch: 'stable/carbon'
- karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/nitrogen'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
# Used by the release job
staging-profile-id: 9324f12310e6a
@@
-86,5
+60,4
@@
project-name: 'atrium'
branch: 'master'
mvn-settings: 'atrium-settings'
project-name: 'atrium'
branch: 'master'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'