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 "Increase ocata packer timeout from 60m to 75m"
[releng/builder.git]
/
jjb
/
dlux
/
dlux.yaml
diff --git
a/jjb/dlux/dlux.yaml
b/jjb/dlux/dlux.yaml
index a935ace4848c12b90184fa123a4a3243a3ac676a..e6ab39ea958f252bd7f08926f074028b235c7baf 100644
(file)
--- a/
jjb/dlux/dlux.yaml
+++ b/
jjb/dlux/dlux.yaml
@@
-1,46
+1,41
@@
---
- project:
---
- project:
- name: dlux-
nitro
gen
+ name: dlux-
oxy
gen
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
- stream:
nitro
gen
+ stream:
oxy
gen
project: 'dlux'
project-name: 'dlux'
branch: 'master'
project: 'dlux'
project-name: 'dlux'
branch: 'master'
- jdk: openjdk8
jdks:
- openjdk8
maven:
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
jdks:
- openjdk8
maven:
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
+ mvn-goals: 'clean install
-e
'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
+
- project:
- project:
- name: dlux-
carbo
n
+ name: dlux-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{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:
carbo
n
+ stream:
nitroge
n
project: 'dlux'
project-name: 'dlux'
project: 'dlux'
project-name: 'dlux'
- branch: 'stable/carbon'
- karaf-version: karaf3
- jdk: openjdk8
+ branch: 'stable/nitrogen'
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-53,22
+48,21
@@
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
+
- project:
- project:
- name: dlux-
bor
on
+ name: dlux-
carb
on
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{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:
bor
on
+ stream:
carb
on
project: 'dlux'
project-name: 'dlux'
project: 'dlux'
project-name: 'dlux'
- branch: 'stable/
bor
on'
+ branch: 'stable/
carb
on'
karaf-version: karaf3
karaf-version: karaf3
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-81,10
+75,13
@@
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
email-upstream: '[dlux] [odlparent]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
+
- project:
name: dlux-sonar
jobs:
- project:
name: dlux-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'dlux'
project-name: 'dlux'
branch: 'master'
project: 'dlux'
project-name: 'dlux'
branch: 'master'