X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=c368819001c838084b782778a6e05d582519bf85;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=251481ee47cdfe644a08305689ac497bcecc9da6;hpb=8d1cf7dd5a3b2810e0640bac08cab52d721419c9;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 251481ee4..c36881900 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,12 +1,20 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-oxygen
+    name: netvirt-csit-openstack-integration-fluorine
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
-    stream: 'oxygen'
+    stream: 'fluorine'
     branch: 'master'
+    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:
@@ -20,58 +28,121 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          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.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
 
     openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          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-port-binding: 'pseudo-agentdb-binding'
-          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'
-          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           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'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
+- project:
+    name: netvirt-csit-openstack-integration-oxygen
+    jobs:
+      - inttest-csit-openstack
+
+    project: 'netvirt'
+    stream: 'oxygen'
+    branch: 'stable/oxygen'
+    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: '{sg-mode}'
+    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_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-stateful
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-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'
+          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}'
+      - queens:
+          openstack-branch: 'master'
+          odl-ml2-branch: 'master'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          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'
+    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:
@@ -85,59 +156,54 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          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-port-binding: 'pseudo-agentdb-binding'
-          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'
-          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           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'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    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'
     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:
@@ -151,46 +217,40 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
       - upstream-stateful:
-          sg-mode: 'stateful'
+          schedule: '@daily'
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+          schedule: '@daily'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
 
     openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          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-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    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-sfc-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:
@@ -218,10 +278,8 @@
     openstack:
       - pike:
           openstack-branch: 'stable/pike'
-          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           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: 'stateful'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'