X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangide%2Fyangide.yaml;h=2cfe449b6f4d7345e1e08580735f5489e560e070;hb=437cbbd93a054564bf4a572cae539483c6644861;hp=ddcabe3bdab72b71cd99cdee22ac3567f5d94038;hpb=90e6051476d97ab8d1bc54d1832f6e931174270b;p=releng%2Fbuilder.git

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index ddcabe3bd..2cfe449b6 100644
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,79 +1,51 @@
 ---
 - project:
-    name: yangide-oxygen
+    name: yangide-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-nitrogen
+    name: yangide-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-carbon
+    name: yangide-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
@@ -81,11 +53,10 @@
 - project:
     name: yangide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'