From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Tue, 2 May 2017 17:23:07 +0000 (-0700)
Subject: Remove 2site netvirt jobs
X-Git-Tag: release/carbon~74^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fd53be3e102e00cc3c5ea4260751d7b1a7674e80;p=releng%2Fbuilder.git

Remove 2site netvirt jobs

these jobs do not work, currently, so no need to define them
and waste resources to queue them to just abort.

Change-Id: I5e657d6e7efa4587c405fd9fcbea825c905a0341
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c9d56913d..a2b1eed9c 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -78,57 +78,6 @@
 
     security-group-mode: '{sg-mode}'
 
-- project:
-    name: netvirt-csit-multi-site-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'netvirt'
-
-    topology:
-      - 2site-1node:
-          openstack_system_count: 6
-          odl_system_count: 2
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,odl-netvirt-federation'
-          num-openstack-sites: 2
-      - 2site-3node:
-          openstack_system_count: 8
-          odl_system_count: 6
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,odl-netvirt-federation'
-          num-openstack-sites: 2
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-
-    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 - 20170314-2256'
-
-    security-group-mode: '{sg-mode}'
-
 - project:
     name: netvirt-csit-extensions-site-openstack-integration
     jobs: