Add option checkout devstack commit

[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 a5cc373274c386b50a4cadfeae4bc6f8eb06f43d..20e3c767ce321277edb2ca8db5295b542db889aa 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,20 +1,24 @@
 ---
-
 - project:
-    name: netvirt-csit-openstack-integration-nitrogen
+    name: netvirt-csit-openstack-integration-oxygen
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
+    stream: 'oxygen'
+    branch: 'master'
+    jre: 'openjdk8'
 
     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'
@@ -22,77 +26,196 @@
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: '@daily'
+          schedule: ''
           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:
+      - gate-stateful:
           schedule: ''
-          sg-mode: 'learn'
-      - gate-learn:
+          sg-mode: 'stateful'
+      - gate-stateful-snat-conntrack:
           schedule: ''
-          sg-mode: 'learn'
-      - gate-transparent:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
           schedule: ''
-          sg-mode: 'transparent'
+          sg-mode: 'stateful'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-driver-version: 'v2'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+          disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu,horizon'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+      - queens:
+          openstack-branch: 'master'
+          odl-ml2-branch: 'master'
+          odl-ml2-driver-version: 'v2'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+
+    security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-openstack-integration-nitrogen
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
+    jre: 'openjdk8'
+
+    topology:
+      - 1node:
+          openstack_system_count: 1
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 1
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - gate-stateful:
           schedule: ''
           sg-mode: 'stateful'
-      - gate-minimal-transparent:
+      - gate-stateful-snat-conntrack:
           schedule: ''
-          sg-mode: 'transparent'
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - gate-tempest-transparent:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
           schedule: ''
-          sg-mode: 'transparent'
-          testplan: '{project}-{topology}-tempest-openstack.txt'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          sg-mode: 'stateful'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+          disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu,horizon'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+      - queens:
+          openstack-branch: 'master'
+          odl-ml2-branch: 'master'
+          odl-ml2-driver-version: 'v2'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+
+    security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-openstack-integration-carbon
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+
+    stream: 'carbon'
+    branch: 'stable/carbon'
+    jre: 'openjdk8'
+    karaf-version: karaf3
+
+    topology:
+      - 1node:
+          openstack_system_count: 1
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 1
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+
+    openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-driver-version: 'v2'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+          disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu,horizon'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
 
     security-group-mode: '{sg-mode}'
 
 - project:
-    name: netvirt-csit-openstack-integration
+    name: netvirt-csit-openstack-integration-boron
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
 
+    stream: 'boron'
+    branch: 'stable/boron'
+    jre: 'openjdk8'
+    karaf-version: karaf3
+
     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'
@@ -131,31 +254,17 @@
           sg-mode: 'transparent'
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
-    stream:
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
     openstack:
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+
+    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 +277,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 +303,8 @@
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+
+    openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+    openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     security-group-mode: 'stateful'