Remove unsupported Beryllium jobs

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

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 9177b5289a20f475d2685b455d33f63886e7f525..74eb0fa4eec01c2573f996fb4e9222543aaae49d 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -1,15 +1,16 @@
 ---
 - project:
-    name: topoprocessing-carbon
+    name: topoprocessing-nitrogen
     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}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
@@ -27,7 +28,7 @@
     archive-artifacts: ''
 
 - project:
-    name: topoprocessing-boron
+    name: topoprocessing-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -36,10 +37,11 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -53,9 +55,8 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-
 - project:
-    name: topoprocessing-beryllium
+    name: topoprocessing-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -64,13 +65,13 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: