Merge "Update validate autorelease projects for carbon"

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

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