X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjsonrpc%2Fjsonrpc.yaml;h=781a4cf1d3e30ec8b67af8b168a629d2fba242f9;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=807e498377e3163ca96aa31a4efa65e98e3e3aec;hpb=53241bd817068fec19782bf46448301ece5edb90;p=releng%2Fbuilder.git

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 807e49837..781a4cf1d 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,17 +1,15 @@
 ---
 - project:
-    name: jsonrpc-nitrogen
+    name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: nitrogen
+    stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,20 +22,20 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
-    name: jsonrpc-carbon
+    name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    stream: nitrogen
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -50,20 +48,21 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
-    name: jsonrpc-boron
+    name: jsonrpc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: boron
-    branch: 'stable/boron'
+    stream: carbon
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -76,10 +75,13 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'