Add a 4c-4g docker system for ansible roles

[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 72c21f8e2240f214df5434a67a0658cfd265e101..3069a4da09f4d956e76324a2dd798bb583fbc0b7 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -4,16 +4,22 @@
     jobs:
       - inttest-csit-apex-custom
 
+    disable-job: true
+
     project: 'netvirt'
     stream:
-      - sodium:
+      - silicon:
           branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
+          jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+
     testplan: '{project}-{topology}-openstack.txt'
 
     test-suites: 'openstack/connectivity/l2.robot
@@ -21,7 +27,7 @@
 
     topology: '1node'
 
-    install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace'
+    install-features: 'odl-netvirt-openstack, odl-mdsal-trace'
 
     public-bridge: 'br-datacentre'
     public-physical-network: 'datacentre'