X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsdninterfaceapp%2Fsdninterfaceapp.yaml;h=1f0eb5fb25b4a912971e3982a03c564b2c61b43a;hb=b1bcf513e7be84f11734c2a152bf658feb44351e;hp=19ffcc184aee9925379481f98a8a4a1940e33bc0;hpb=2560c7522b16c32b6057426d3b794452e0cccd1a;p=releng%2Fbuilder.git

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 19ffcc184..1f0eb5fb2 100644
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -1,91 +1,75 @@
 ---
 - project:
-    name: sdninterfaceapp-nitrogen
+    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}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
-    jdk: openjdk8
-    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
+
 - project:
-    name: sdninterfaceapp-carbon
+    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}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
+    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
+
 - project:
-    name: sdninterfaceapp-boron
+    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}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdk: openjdk8
-    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
+
 - 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'