X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetide%2Fnetide.yaml;h=318b15c508a821d628ff48df3ed650a429931876;hb=580538afd2795b61a826ccd08195628c729d63cb;hp=52ba702b62b356023d54fb45cbb422987647572e;hpb=5e174f5369c8d24a081f37f8ea227c1fff8ebb0e;p=releng%2Fbuilder.git

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 52ba702b6..318b15c50 100644
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -1,19 +1,15 @@
 ---
 - project:
-    name: netide-carbon
+    name: netide-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'netide'
     project-name: 'netide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,21 +22,20 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
-    name: netide-boron
+    name: netide-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'netide'
     project-name: 'netide'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,23 +48,22 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
-    name: netide-beryllium
+    name: netide-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'netide'
     project-name: 'netide'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -81,10 +75,13 @@
     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'