Merge "Add stein devstack jobs"

[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 a4f26094d611ae15aa1b5313f148441e565240a3..813abc6b5efe31ec3dc3186580a210aefe2abac9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -254,53 +254,6 @@
           openstack_system_image: '{openstack_stein_system_image}'
           openstack_system2_image: '{openstack_stein_system_image}'
 
-- project:
-    name: netvirt-csit-sfc-openstack-integration
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-8
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-sfc'
-
-    functionality:
-      - 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'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
-    stream:
-      - magnesium:
-          branch: 'master'
-          ovs-install: 'v2.9.2'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-          ovs-install: 'v2.9.2'
-      - neon:
-          branch: 'stable/neon'
-          ovs-install: 'v2.9.2'
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
@@ -320,6 +273,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon: