Merge "Fix apt concurrency failures"

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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index ae1560b10dffc41453f5d1b69084f0ff987f2cc1..c9d56913d39fabecf42c256764ec82224f456109 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -22,13 +22,17 @@
 
     functionality:
       - upstream-transparent:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: 'H H/4 * * *'
+          schedule: ''
           sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - upstream-learn:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'learn'
       - gate-learn:
           schedule: ''
@@ -49,18 +53,19 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
@@ -98,16 +103,19 @@
 
     functionality:
       - upstream-stateful:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'stateful'
       - upstream-learn:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'learn'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
@@ -133,7 +141,7 @@
           openstack_system_count: 3
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          install-features: 'odl-netvirt-sfc'
 
     functionality:
       - extensions-sfc:
@@ -142,9 +150,12 @@
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     openstack:
       - newton-nodl-v2: