Merge "Update CentOS7 devstack-newton images"

[releng/builder.git] / jjb / unimgr / unimgr.yaml

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 3f692b74a91cf4abefd7d0a4439c97e84df17694..af3b5ba1a36be467c4eb3cd60c0d11eeb5576152 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: unimgr-carbon
+    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}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
@@ -27,7 +26,7 @@
     archive-artifacts: ''
 
 - project:
-    name: unimgr-boron
+    name: unimgr-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -36,10 +35,11 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -53,9 +53,8 @@
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
-
 - project:
-    name: unimgr-beryllium
+    name: unimgr-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -64,14 +63,14 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'