Remove usc carbon jobs

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

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index a43ce024c75d3beacfa16ac30e0d9b54d77e94ad..0ef3a94d96a5ce3a41e627cb780c748603ef2c2e 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -22,9 +22,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index ca04c7f2d62aa361e2280c09a8ada5a273d7b189..02a1d544c5493965ddb1f980903d122c4f645868 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index b11b299d81546a4a19b9679df86399bcf8e23b47..e447eca17d0b94d2dc0a23fdbfbc315c0a6c782f 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -55,26 +55,6 @@
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
 - project:
     name: usc-sonar
     jobs: