X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetide%2Fnetide.yaml;h=abc54479c3d6e75dcd40f4b5f96ac42e11ee0c3b;hb=cbf13450815f7ce1d1c080550686ac0243528c21;hp=c5e63d5da6ca31d4a52f0d08efd24224c6d56553;hpb=fc441b2b3f644271eef0b5f8807f6294b702ec9e;p=releng%2Fbuilder.git

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index c5e63d5da..abc54479c 100644
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -1,95 +1,65 @@
 ---
 - project:
-    name: netide-nitrogen
+    name: netide-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'netide'
     project-name: 'netide'
     branch: 'master'
-    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-carbon
+    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: carbon
+    stream: nitrogen
     project: 'netide'
     project-name: 'netide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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-boron
+    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: boron
+    stream: carbon
     project: 'netide'
     project-name: 'netide'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     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'
     mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'