Merge "Remove centinel carbon jobs"

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index 7a4a45f52deafc7fe9dc049b54f74884c08522b9..709290183280f30e7b0347f3f5520bb5d0d73f41 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.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/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 71d0b5cedeaf6b1e9e3b307c04c7aaa79a274e88..5d8da824d08f129d9d4fddbbd0b8431232022819 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -52,25 +52,6 @@
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
 
-- project:
-    name: centinel-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
 - project:
     name: centinel-sonar
     jobs: