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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 96f5c13b4..781a4cf1d 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,16 +2,14 @@
 - project:
     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: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,19 +22,20 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     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: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -49,20 +48,21 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     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: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,36 +75,13 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
-- project:
-    name: jsonrpc-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: boron
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-    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]'
-    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'