Remove ocpplugin carbon jobs

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

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index 142e659d88c675bf561aa178691fc51847772a2a..6b3da1bfe654a7e69597c081324e4d4e61a48982 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index a7c7c562802db897be7f85913ec62a5b651bf4a2..a1ee88d2263515ef41a338e0b2a6f200e5c52dc8 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:

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