X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=db97acfc27f6e1207661b6c580ef323339bd986f;hb=fade3fc86a42f5c2aa42db7144fe6ae9e31ffaf9;hp=20e3c767ce321277edb2ca8db5295b542db889aa;hpb=ca6c672aad5f34e2367f8e4fc80ef0899fd73fe1;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 20e3c767c..db97acfc2 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -2,309 +2,220 @@
 - project:
     name: netvirt-csit-openstack-integration-oxygen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    jre: 'openjdk8'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     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
       - upstream-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
 
     openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - 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'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - 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}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-openstack-integration-nitrogen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    jre: 'openjdk8'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     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
       - upstream-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - 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'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - 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}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-openstack-integration-carbon
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
-
     stream: 'carbon'
     branch: 'stable/carbon'
-    jre: 'openjdk8'
     karaf-version: karaf3
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     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'
+          schedule: '@daily'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+          schedule: '@daily'
+      - gate-stateful
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
 
     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'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - 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}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
 
 - project:
-    name: netvirt-csit-openstack-integration-boron
+    name: netvirt-csit-sfc-openstack-integration
     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: 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-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - 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'
-
-    openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v2'
-
-    openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-    openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-
-    security-group-mode: '{sg-mode}'
-
-- project:
-    name: netvirt-csit-extensions-site-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:
-          openstack_system_count: 1
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-sfc'
 
     functionality:
-      - extensions-sfc:
-          schedule: ''
+      - sfc:
+          enable-openstack-services: 'placement-api,tempest'
+          enable-openstack-compute-services: 'placement-client'
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     openstack:
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v2'
-
-    openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-    openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-
-    security-group-mode: 'stateful'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'