Update cloud image

[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..834a98bdb922fc67edcdf40787615a1e2bb1f2dc 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -4,34 +4,44 @@
     jobs:
       - inttest-csit-apex-custom
 
-    project: 'netvirt'
+    disable-job: true
+
+    project: "netvirt"
     stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-    testplan: '{project}-{topology}-openstack.txt'
+      - silicon:
+          branch: "master"
+          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
+      openstack/connectivity/external_network.robot"
 
-    test-suites: 'openstack/connectivity/l2.robot
-                  openstack/connectivity/external_network.robot'
+    topology: "1node"
 
-    topology: '1node'
+    install-features: "odl-netvirt-openstack, odl-mdsal-trace"
 
-    public-bridge: 'br-datacentre'
-    public-physical-network: 'datacentre'
-    odl-snat-mode: 'conntrack'
+    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_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_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'
+    apex_compute_1_flavor: "v1-standard-4"
+    apex_compute_1_image: "ZZCI - OPNFV - apex - compute - 1"
 
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -40,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"