X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Funimgr%2Funimgr.yaml;h=5be5e843376893f78b8827683758c66b1dfca580;hb=dac658c4a6587a4b299b18df0e2c558371722167;hp=d0df6b98d213f783e1b2ce2cef6f029b326447a1;hpb=5d4341b46a6d1875befc576ebc63d385ebd48181;p=releng%2Fbuilder.git

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index d0df6b98d..5be5e8433 100644
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,125 +1,89 @@
 ---
 - project:
-    name: unimgr-nitrogen
+    name: unimgr-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: '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
 
-- project:
-    name: unimgr-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}'
-
-    stream: carbon
-    project: 'unimgr'
-    project-name: 'unimgr'
-    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: ''
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-boron
+    name: unimgr-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: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     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-beryllium
+    name: unimgr-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: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk7
     jdks:
-      - openjdk7
-        - openjdk8
+      - 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'