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 822405efcc81946a9482e9519799bc564451c4e8..20e3c767ce321277edb2ca8db5295b542db889aa 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,12 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-nitrogen
+    name: netvirt-csit-openstack-integration-oxygen
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
-
-    stream: 'nitrogen'
+    stream: 'oxygen'
     branch: 'master'
     jre: 'openjdk8'
 
@@ -27,9 +26,6 @@
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - upstream-stateful:
           schedule: ''
           sg-mode: 'stateful'
@@ -37,15 +33,74 @@
           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'
@@ -57,24 +112,11 @@
           schedule: ''
           sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
-      - 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'
 
     openstack:
-      - 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_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'
@@ -121,9 +163,6 @@
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - upstream-stateful:
           schedule: ''
           sg-mode: 'stateful'
@@ -131,26 +170,9 @@
           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'
 
     openstack:
       - ocata:
@@ -159,6 +181,16 @@
           odl-ml2-driver-version: 'v2'
           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}'