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 "Clean L2GW CSIT, use same VMs as NetVirt"
[releng/builder.git]
/
jjb
/
bier
/
bier.yaml
diff --git
a/jjb/bier/bier.yaml
b/jjb/bier/bier.yaml
index 3a54e71373756d6ff2e9becf1e5a8d803d8b429d..3dd2638f4d46849b28310e865e566c9fe30c2ea6 100644
(file)
--- a/
jjb/bier/bier.yaml
+++ b/
jjb/bier/bier.yaml
@@
-3,19
+3,18
@@
name: bier-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: bier-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
stream: oxygen
project: 'bier'
project-name: 'bier'
branch: 'master'
- odl-maven-jobs
stream: oxygen
project: 'bier'
project-name: 'bier'
branch: 'master'
+ build-node: centos7-builder-2c-8g
build-timeout: 90
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
build-timeout: 90
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 942a8075b1f2a
# Used by the release job
staging-profile-id: 942a8075b1f2a
@@
-24,18
+23,17
@@
name: bier-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: bier-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
stream: nitrogen
project: 'bier'
project-name: 'bier'
branch: 'stable/nitrogen'
- odl-maven-jobs
stream: nitrogen
project: 'bier'
project-name: 'bier'
branch: 'stable/nitrogen'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 942a8075b1f2a
# Used by the release job
staging-profile-id: 942a8075b1f2a
@@
-44,19
+42,18
@@
name: bier-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: bier-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- odl-maven-jobs
stream: carbon
project: 'bier'
project-name: 'bier'
branch: 'stable/carbon'
- odl-maven-jobs
stream: carbon
project: 'bier'
project-name: 'bier'
branch: 'stable/carbon'
+ build-node: centos7-builder-2c-8g
karaf-version: karaf3
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
karaf-version: karaf3
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[bier]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 942a8075b1f2a
# Used by the release job
staging-profile-id: 942a8075b1f2a
@@
-69,5
+66,6
@@
project: 'bier'
project-name: 'bier'
branch: 'master'
project: 'bier'
project-name: 'bier'
branch: 'master'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-settings: 'bier-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'