X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-apex.yaml;h=834a98bdb922fc67edcdf40787615a1e2bb1f2dc;hb=548c01af3eed5174341ac884abb52db52bac0604;hp=92231e47bf36c3952798fb25ea3145bfe279144d;hpb=240756b41a78658792ad3e940526acda499ef96a;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 92231e47bf..834a98bdb9 100644
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -2,31 +2,46 @@
 - project:
     name: netvirt-csit-apex-integration-oxygen
     jobs:
-      - inttest-csit-apex
+      - inttest-csit-apex-custom
 
-    project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
-    testplan: '{project}-{topology}-openstack.txt'
+    disable-job: true
 
-    test-suites: 'openstack/connectivity/l2.robot
-                  openstack/connectivity/external_network.robot'
+    project: "netvirt"
+    stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+      - sodium:
+          branch: "stable/sodium"
 
-    topology: '1node'
+    testplan: "{project}-{topology}-openstack.txt"
 
-    public-bridge: 'br-datacentre'
-    public-physical-network: 'datacentre'
-    odl-snat-mode: 'conntrack'
+    test-suites: "openstack/connectivity/l2.robot
+      openstack/connectivity/external_network.robot"
 
-    apex_controller_count: '1'
-    apex_controller_flavor: 'v1-standard-8'
-    apex_controller_image: 'ZZCI - OPNFV - apex - controller - 0'
+    topology: "1node"
 
-    apex_compute_0_flavor: 'v1-standard-4'
-    apex_compute_0_image: 'ZZCI - OPNFV - apex - compute - 0'
+    install-features: "odl-netvirt-openstack, odl-mdsal-trace"
 
-    apex_compute_1_flavor: 'v1-standard-4'
-    apex_compute_1_image: 'ZZCI - OPNFV - apex - compute - 1'
+    public-bridge: "br-datacentre"
+    public-physical-network: "datacentre"
+    odl-snat-mode: "conntrack"
+
+    apex_controller_count: "1"
+    apex_controller_flavor: "v1-standard-8"
+    apex_controller_image: "ZZCI - OPNFV - apex - controller - 0"
+
+    apex_compute_0_flavor: "v1-standard-4"
+    apex_compute_0_image: "ZZCI - OPNFV - apex - compute - 0"
+
+    apex_compute_1_flavor: "v1-standard-4"
+    apex_compute_1_image: "ZZCI - OPNFV - apex - compute - 1"
 
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -35,8 +50,8 @@
     functionality:
       - upstream-snat-conntrack
       - gate-snat-conntrack:
-          gate-job: 'True'
+          gate-job: "True"
 
     openstack:
       - queens:
-          openstack-branch: 'stable/queens'
+          openstack-branch: "stable/queens"