Fix L2GW CSIT for Ocata Stacking Failure

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 52cee01d90d8ca59c552da0f8b212603ee1c6c14..9d4b101b498043b1189ab67bf1b87f76f9708aae 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -35,6 +35,7 @@
       - 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'
       - pike:
@@ -100,6 +101,7 @@
       - 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'
       - pike:
@@ -167,6 +169,7 @@
       - 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'
       - pike:
@@ -186,66 +189,3 @@
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-boron
-    jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'netvirt'
-
-    stream: 'boron'
-    branch: 'stable/boron'
-    jre: 'openjdk8'
-    karaf-version: karaf3
-
-    topology:
-      - 1node:
-          openstack_system1_count: 1
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system1_count: 1
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
-    functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-
-    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}'
-
-    tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-    enable-openstack-services: 'neutron,nova,l2gw-plugin'
-