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 "Install odl-mdsal-trace in netvirt oxygen csit"
[releng/builder.git]
/
jjb
/
mdsal
/
mdsal-csit-bindingv1.yaml
diff --git
a/jjb/mdsal/mdsal-csit-bindingv1.yaml
b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index c91af50441823c56b5b86c4adf53f1052377fd5d..6e6075725bc66d2f70435c4a46ee9ffd77b30e3b 100644
(file)
--- a/
jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/
jjb/mdsal/mdsal-csit-bindingv1.yaml
@@
-2,7
+2,7
@@
- project:
name: mdsal-csit-bindingv1
jobs:
- project:
name: mdsal-csit-bindingv1
jobs:
- -
'{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+ -
inttest-csit-1node-periodic
# The project name
project: 'mdsal'
# The project name
project: 'mdsal'
@@
-10,24
+10,17
@@
# The functionality under test
functionality: 'bindingv1'
# The functionality under test
functionality: 'bindingv1'
- # Project branches. Boron for actual testing, Beryllium for sanity.
stream:
stream:
- -
nitrogen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+ branch: 'stable/nitrogen'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
+ karaf-version: karaf3
robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
- robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
install:
- only:
install:
- only:
@@
-35,7
+28,7
@@
# No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
tools_system_count: 0
# No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
tools_system_count: 0
- odl_system_flavor:
8 GB General Purpose v1
+ odl_system_flavor:
v2-standard-4
# Features to install
install-features: 'odl-restconf'
# Features to install
install-features: 'odl-restconf'