Print git-diff when pre-commit fails

[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..075701fae38a34104364bd6946091ed2e5e28b20 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -4,14 +4,19 @@
     jobs:
       - inttest-csit-apex-custom
 
+    disable-job: true
+
     project: 'netvirt'
     stream:
-      - neon:
+      - aluminium:
           branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+
     testplan: '{project}-{topology}-openstack.txt'
 
     test-suites: 'openstack/connectivity/l2.robot
@@ -19,6 +24,8 @@
 
     topology: '1node'
 
+    install-features: 'odl-netvirt-openstack, odl-mdsal-trace'
+
     public-bridge: 'br-datacentre'
     public-physical-network: 'datacentre'
     odl-snat-mode: 'conntrack'