X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Funimgr%2Funimgr.yaml;h=ebc5171c08f2c1c43bd17a4024f5b88bd05da4e1;hb=777b985b90c56b823d0f6f587ffe7e4589183294;hp=9eaae4f43670e7913febafc23a1cd092eddd21a8;hpb=d3c70388cad6230a95ca760e7654bd1d5d5593a0;p=releng%2Fbuilder.git

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9eaae4f43..ebc5171c0 100644
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,85 +1,56 @@
 ---
 - project:
-    name: unimgr-oxygen
+    name: unimgr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-nitrogen
+    name: unimgr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-carbon
+    name: unimgr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -92,5 +63,4 @@
     project-name: 'unimgr'
     branch: 'master'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'