Switch to using new odl-maven-jobs group

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

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1175fe05c64a37f34ab8bb27ba499dc14f26d027..a74ba2d59564fac992e307bb4d457b70e6d38e45 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,17 +2,14 @@
 - project:
     name: sxp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +22,20 @@
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +48,21 @@
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,10 +75,13 @@
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'