From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 3 May 2018 11:47:51 +0000 (+1000)
Subject: Remove netvirt carbon jobs
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0545813b64b19cd1ac6dc06852cd6272b351de83;p=releng%2Fbuilder.git

Remove netvirt carbon jobs

Change-Id: Ie233818e03e3f6e6e8759372da79e256c9cfa043
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index ad9aefa2c..e2130df80 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -157,57 +157,3 @@
           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-hwvtep-openstack-integration-carbon
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    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}'
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 02475d741..89f48409f 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -170,61 +170,6 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-- project:
-    name: netvirt-csit-openstack-integration-carbon
-    jobs:
-      - 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: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-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:
-          schedule: '@daily'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '@daily'
-      - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-
-    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}'
-
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index bb4852f00..8cf106f88 100644
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -11,9 +11,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 73b3adb16..194d2d69b 100644
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -18,10 +18,6 @@
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 8a00e9b51..6f83a6b81 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -20,9 +20,7 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+
     project: 'netvirt'
     project-name: 'netvirt'
     mvn-settings: 'netvirt-settings'