Merge "Update Ubuntu 1404 with 1604 mininet-ovs-25 images"

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

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index fb444e2e3c98bfa42ba214ecc27496e41b7b8548..7c03df5c1ef8d7f5ec3be6d1aef1daae4a408e2b 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: snmp4sdn-carbon
+    name: snmp4sdn-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: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
@@ -27,7 +26,7 @@
     archive-artifacts: ''
 
 - project:
-    name: snmp4sdn-boron
+    name: snmp4sdn-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: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,7 +54,7 @@
     archive-artifacts: ''
 
 - project:
-    name: snmp4sdn-beryllium
+    name: snmp4sdn-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -63,13 +63,13 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: