X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjsonrpc%2Fjsonrpc.yaml;h=033d8978dafe2e6f975de16223610757b660e4c4;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=581508c45762983f248660b7d1f50188a688dec5;hpb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;p=releng%2Fbuilder.git

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 581508c45..033d8978d 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,20 +2,16 @@
 - project:
     name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -23,20 +19,17 @@
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: oxygen
-    branch: 'stable/oxygen'
-    jdks:
-      - openjdk8
+    branch: 'master'
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -44,20 +37,16 @@
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -65,7 +54,6 @@
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -73,13 +61,10 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d