From: Abhinav Gupta <abhinav.gupta@ericsson.com>
Date: Wed, 4 Dec 2019 07:52:27 +0000 (+0530)
Subject: Decoupling SFC from Netvirt
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ff09fda407017f873e18625bc94a5c2217a65026;p=releng%2Fbuilder.git

Decoupling SFC from Netvirt

Signed-off-by: Abhinav Gupta <abhinav.gupta@ericsson.com>
Change-Id: I5a5b9eacc3be23827401eacd735bd58f7ce1ab88
---

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index c91bf39af..0ff6a4e42 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -594,7 +594,6 @@
       - lispflowmapping-csit-1node-msmr-all-neon
       - netconf-csit-1node-callhome-only-neon
       - netconf-csit-1node-userfeatures-all-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon
       - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
       - openflowplugin-csit-1node-flow-services-all-neon
       - openflowplugin-csit-1node-longevity-only-neon
@@ -607,8 +606,6 @@
       - openflowplugin-csit-3node-clustering-bulkomatic-only-neon
       - openflowplugin-csit-3node-clustering-only-neon
       - ovsdb-csit-3node-upstream-clustering-only-neon
-      - sfc-csit-3node-docker-full-deploy-all-neon
-      - sfc-csit-3node-rest-basic-all-neon
     view-type: list
     filter-executors: false
     filter-queue: false
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 5e1301a57..75f999608 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -254,53 +254,6 @@
           openstack_system_image: '{openstack_queens_system_image}'
           openstack_system2_image: '{openstack_queens_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:
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 03c1962ad..375e2c565 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -33,9 +33,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -72,9 +71,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -111,9 +109,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba