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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 48cb51f35..033d8978d 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,24 +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
-    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
@@ -27,24 +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
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'master'
     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
@@ -52,24 +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
-    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
@@ -77,7 +54,6 @@
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -85,17 +61,10 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    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
@@ -109,5 +78,4 @@
     project-name: 'jsonrpc'
     branch: 'master'
     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'