Merge "Switch all projects to use new maven-merge job"

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

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 0329c730f6c282e77954587d23dc0e39329e730d..704e1c78975a37342f7a0d4688076be6dbd1a7ac 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -2,11 +2,9 @@
 - project:
     name: sdninterfaceapp-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}'
+      - '{project-name}-maven-jobs'
 
     stream: oxygen
     project: 'sdninterfaceapp'
@@ -24,14 +22,15 @@
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-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}'
+      - '{project-name}-maven-jobs'
 
     stream: nitrogen
     project: 'sdninterfaceapp'
@@ -49,14 +48,15 @@
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-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}'
+      - '{project-name}-maven-jobs'
 
     stream: carbon
     project: 'sdninterfaceapp'
@@ -75,10 +75,13 @@
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'