Merge "Migrate project jobs to use lf-infra-publish"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6dd2316fb132acd40d9640d8e5a142594f426eb7..e14bce5bf49337aee674f47813bc8b08428f4d81 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,15 +1,16 @@
 ---
 - project:
-    name: yangtools-carbon
+    name: yangtools-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: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
@@ -27,7 +28,7 @@
     archive-artifacts: ''
 
 - project:
-    name: yangtools-boron
+    name: yangtools-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -36,16 +37,15 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     maven:
-      - mvn32:
-          mvn-version: 'mvn32'
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
@@ -56,7 +56,7 @@
     archive-artifacts: ''
 
 - project:
-    name: yangtools-beryllium
+    name: yangtools-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -65,13 +65,13 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn32: