Merge "Generate versions.csv for autorelease builds"

[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 bc2ecbb758e05a8516597fd19ace123b7dc7f2e8..a2c8c6d345bc9a59b65f0b778be6b4ae905875da 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,83 +1,4 @@
 ---
-
-- project:
-    name: netvirt-csit-openstack-integration-nitrogen
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'netvirt'
-
-    topology:
-      - 1node:
-          openstack_system_count: 3
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system_count: 4
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-      - upstream-stateful:
-          schedule: '@daily'
-          sg-mode: 'stateful'
-          # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/netvirt/job/netvirt-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.netvirt$vpnservice-karaf/artifact/org.opendaylight.netvirt/vpnservice-karaf/0.5.0-SNAPSHOT/vpnservice-karaf-0.5.0-SNAPSHOT.zip'
-      - upstream-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
-          odl-snat-mode: 'conntrack'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - gate-minimal-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - gate-tempest-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-          testplan: '{project}-{topology}-tempest-openstack.txt'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-
-    openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-
-    security-group-mode: '{sg-mode}'
-
 - project:
     name: netvirt-csit-openstack-integration
     jobs:
@@ -87,12 +8,14 @@
 
     topology:
       - 1node:
-          openstack_system_count: 3
+          openstack_system_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system_count: 4
+          openstack_system_count: 1
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -132,6 +55,12 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -145,17 +74,20 @@
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     security-group-mode: '{sg-mode}'
 
@@ -168,7 +100,8 @@
 
     topology:
       - 1node:
-          openstack_system_count: 3
+          openstack_system_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-sfc'
@@ -193,6 +126,6 @@
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     security-group-mode: 'stateful'