Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index eb9f5786d5a448b3c59275a892c633dc14381717..99c856bf9a84638e2bc6027963e45b1a941a1258 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -3,25 +3,17 @@
     name: sdninterfaceapp-oxygen
     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'
     project-name: 'sdninterfaceapp'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
@@ -30,25 +22,17 @@
     name: sdninterfaceapp-nitrogen
     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'
     project-name: 'sdninterfaceapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
@@ -57,26 +41,18 @@
     name: sdninterfaceapp-carbon
     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'
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
@@ -84,10 +60,10 @@
 - project:
     name: sdninterfaceapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'