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 "Fix genius CSIT jobs"
[releng/builder.git]
/
jjb
/
l2switch
/
l2switch.yaml
diff --git
a/jjb/l2switch/l2switch.yaml
b/jjb/l2switch/l2switch.yaml
index 22ab3dab821d594c13e3fd6e3022a6c45b50c9e7..6e1af41fbbd15b7e77229a1d918dfee560365dd3 100644
(file)
--- a/
jjb/l2switch/l2switch.yaml
+++ b/
jjb/l2switch/l2switch.yaml
@@
-1,26
+1,15
@@
---
- project:
---
- project:
- name: l2switch-
carbo
n
+ name: l2switch-
oxyge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{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:
oxyge
n
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-29,30
+18,21
@@
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96fee85953ca0
- project:
- project:
- name: l2switch-
boro
n
+ name: l2switch-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{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:
boro
n
+ stream:
nitroge
n
project: 'l2switch'
project-name: 'l2switch'
project: 'l2switch'
project-name: 'l2switch'
- branch: 'stable/boron'
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/nitrogen'
mvn-settings: 'l2switch-settings'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-61,31
+41,22
@@
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96fee85953ca0
- project:
- project:
- name: l2switch-
beryllium
+ name: l2switch-
carbon
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{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:
beryllium
+ stream:
carbon
project: 'l2switch'
project-name: 'l2switch'
project: 'l2switch'
project-name: 'l2switch'
- branch: 'stable/beryllium'
- jdk: openjdk7
- jdks:
- - openjdk7
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ branch: 'stable/carbon'
+ karaf-version: karaf3
mvn-settings: 'l2switch-settings'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-94,15
+65,16
@@
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
openflowjava-merge-{stream},
openflowplugin-merge-{stream}
email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96fee85953ca0
- project:
name: l2switch-sonar
jobs:
- project:
name: l2switch-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
mvn-settings: 'l2switch-settings'
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'