Remove l2switch carbon jobs

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

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 63be624c0097db7ffe7e0a597fa62b8345630ef2..8509c013974a76f26f5da48c92a7fc1e65b3f937 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index f5657336913f6ed019f6b5e1083a5d798c6b36d5..c85c9f64deda3d6d17a3b84f8fa1d342a082f1b9 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 54fb5958c1085a387fddc75018103305167bb5e5..62e8620c0a38de91e1f974476beb9390eb79eb73 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index fd3e64984569a54c09f736cfcdc2fce44c8f9c7f..b3a3a205d0ab23ac484970284c847b214a67e429 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -15,9 +15,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - all:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 3792df73364a4a909e27c85f1bb1436048c046ab..c55bb6ced91892e54a1b4f2906b885f60ce66b77 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -67,30 +67,6 @@
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
 - project:
     name: l2switch-sonar
     jobs: