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
/
groupbasedpolicy
/
groupbasedpolicy-csit-1node-openstack.yaml
diff --git
a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 1edfb4648e04fe9437a004049219c5c9b61a9535..208341cb8a4c72aa5e1101721db66fcca9c67329 100644
(file)
--- a/
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@
-1,16
+1,17
@@
+---
- project:
name: groupbasedpolicy-csit-openstack-integration
jobs:
- project:
name: groupbasedpolicy-csit-openstack-integration
jobs:
- - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+ - inttest-csit-openstack
# The project name
project: 'groupbasedpolicy'
topology:
# The project name
project: 'groupbasedpolicy'
topology:
-
- 1node:
-
openstack_system_count: 1
-
odl_system_count: 1
-
enable-haproxy: 'no'
+ - 1node:
+ openstack_system_count: 1
+ odl_system_count: 1
+ enable-haproxy: 'no'
testplan: '{project}-{topology}-openstack.txt'
testplan: '{project}-{topology}-openstack.txt'
@@
-18,43
+19,24
@@
functionality: 'openstack'
stream:
functionality: 'openstack'
stream:
- - carbon:
- branch: 'master'
- jre: 'openjdk8'
- install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
- install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
+ - oxygen:
+ branch: 'master'
+ install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+ - carbon:
+ branch: 'stable/carbon'
+ karaf-version: karaf3
+ install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
openstack:
openstack:
- - mitaka:
- openstack-branch: 'stable/mitaka'
- odl-ml2-branch: 'stable/mitaka'
- odl-ml2-driver-version: 'v1'
- - liberty:
- openstack-branch: 'stable/liberty'
- odl-ml2-branch: 'stable/liberty'
- odl-ml2-driver-version: 'v1'
-
- schedule: 'H H * * *'
-
- odl-enable-l3: 'yes'
+ - newton:
+ openstack-branch: 'stable/ocata'
+ odl-ml2-branch: 'stable/ocata'
public-bridge: 'br-int'
public-bridge: 'br-int'
- public-physical-network: 'physnet1'
-
- enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
- disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-
- tenant-network-type: 'vxlan'
+ enable-openstack-plugins: 'networking-odl'
security-group-mode: 'none'
security-group-mode: 'none'
-
- robot-options: ''