X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetide%2Fnetide.yaml;h=318b15c508a821d628ff48df3ed650a429931876;hb=b4119213eb17b16ed5ca0b9672df9fc14b306a7f;hp=8f02f86dac1a6908316a94ea4f17c7daae09afe6;hpb=5dc8c48a0fa0b6cd840613d03b08f4cbb8285e35;p=releng%2Fbuilder.git

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 8f02f86da..318b15c50 100644
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -2,17 +2,14 @@
 - project:
     name: netide-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: 'netide'
     project-name: 'netide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +22,20 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-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: 'netide'
     project-name: 'netide'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +48,21 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-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: 'netide'
     project-name: 'netide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,37 +75,13 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
-- project:
-    name: netide-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a67bab3755815
 
 - project:
     name: netide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netide'
     project-name: 'netide'
     branch: 'master'