Merge "Fix packaging tox-verify to run only master"

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

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index eb9f5786d5a448b3c59275a892c633dc14381717..90d2d5aa51c2cd2e39b9d2a686b0e36259de03d6 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sdninterfaceapp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sdninterfaceapp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sdninterfaceapp'
@@ -84,7 +81,7 @@
 - project:
     name: sdninterfaceapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'