X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Funimgr%2Funimgr.yaml;h=e53712d932f9d646d844ffff372823711a9b7aee;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=8e10b9f26d215bb08ecbd6e773e4488ce19cb086;hpb=a345dde393688cbe66a0171e184e4e02f94d2371;p=releng%2Fbuilder.git

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 8e10b9f26..e53712d93 100644
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,91 +1,87 @@
 ---
 - project:
-    name: unimgr-nitrogen
+    name: unimgr-fluorine
     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
+    stream: fluorine
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
-    jdk: openjdk8
-    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-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-carbon
+    name: unimgr-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: carbon
+    stream: oxygen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
+- project:
+    name: unimgr-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'unimgr'
+    project-name: 'unimgr'
+    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-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-boron
+    name: unimgr-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: boron
+    stream: carbon
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    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-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
 
 - project:
     name: unimgr-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'