Merge "Remove centinel carbon jobs"

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index aa9d59210ec726b9e8924a36603b2a1f2cf05bab..168fa943b8074721b15c7cb2d3e98c1f1dbf31dd 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,7 +2,6 @@
 - project:
     name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -13,7 +12,6 @@
     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
@@ -21,7 +19,7 @@
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -32,7 +30,6 @@
     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
@@ -40,7 +37,6 @@
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -51,27 +47,6 @@
     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-carbon
-    jobs:
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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