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 packaging tox-verify to run only master"
[releng/builder.git]
/
jjb
/
reservation
/
reservation.yaml
diff --git
a/jjb/reservation/reservation.yaml
b/jjb/reservation/reservation.yaml
index a846568d8cd92124ec9bdf406a80488733cdc0aa..1e32c5d215fb6df24902daf122591b8518a2d3cd 100644
(file)
--- a/
jjb/reservation/reservation.yaml
+++ b/
jjb/reservation/reservation.yaml
@@
-1,17
+1,14
@@
---
- project:
---
- project:
- name: reservation-
nitro
gen
+ name: reservation-
oxy
gen
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-integration-{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: 'reservation'
project-name: 'reservation'
branch: 'master'
project: 'reservation'
project-name: 'reservation'
branch: 'master'
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-24,20
+21,19
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
- project:
- name: reservation-
carbo
n
+ name: reservation-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
- stream:
carbo
n
+ stream:
nitroge
n
project: 'reservation'
project-name: 'reservation'
project: 'reservation'
project-name: 'reservation'
- branch: 'stable/carbon'
- karaf-version: karaf3
- jdk: openjdk8
+ branch: 'stable/nitrogen'
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-50,20
+46,20
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
- project:
- name: reservation-
bor
on
+ name: reservation-
carb
on
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
- stream:
bor
on
+ stream:
carb
on
project: 'reservation'
project-name: 'reservation'
project: 'reservation'
project-name: 'reservation'
- branch: 'stable/
bor
on'
+ branch: 'stable/
carb
on'
karaf-version: karaf3
karaf-version: karaf3
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-76,10
+72,13
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
name: reservation-sonar
jobs:
- project:
name: reservation-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'reservation'
project-name: 'reservation'
branch: 'master'
project: 'reservation'
project-name: 'reservation'
branch: 'master'