Merge "Remove centinel carbon jobs"

[releng/builder.git] / jjb / jsonrpc / jsonrpc.yaml

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 033d8978dafe2e6f975de16223610757b660e4c4..168fa943b8074721b15c7cb2d3e98c1f1dbf31dd 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -25,7 +25,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: oxygen
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -51,24 +51,6 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-sonar
     jobs: