Merge "Remove odlparent-3.0.x jobs"

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 168fa943b8074721b15c7cb2d3e98c1f1dbf31dd..41522921f345e23577fc920fde449627c3e412ee 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: jsonrpc-fluorine
+    name: jsonrpc-sodium
     jobs:
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: fluorine
+    stream: sodium
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -17,15 +17,31 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-oxygen
+    name: jsonrpc-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: neon
+    branch: 'stable/neon'
+    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-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -35,18 +51,20 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-nitrogen
+    name: jsonrpc-oxygen
     jobs:
+      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
+    stream: oxygen
+    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}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -61,3 +79,9 @@
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: jsonrpc-view
+    views:
+      - project-view
+    project-name: jsonrpc