Merge "Remove odlparent-3.0.x jobs"

[releng/builder.git] / jjb / netvirt / netvirt-csit-multi-apex.yaml

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 9647cc22f8b64797498eb80d70600d4d60690d9d..efc2b804bdf043249a17a9faa59ddfa42dcb671c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -6,12 +6,16 @@
 
     project: 'netvirt'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
+
     testplan: '{project}-{topology}-openstack.txt'
 
     test-suites: 'openstack/connectivity/l2.robot
@@ -19,6 +23,8 @@
 
     topology: '1node'
 
+    install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace'
+
     public-bridge: 'br-datacentre'
     public-physical-network: 'datacentre'
     odl-snat-mode: 'conntrack'