Merge "Remove infrautils carbon jobs"

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index 7eceb9a3799749a2af8550de5c0de7a39d606557..34a5f96907343905536423cafbaa521ae40e040b 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -16,10 +16,6 @@
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 

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