X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=91a75963513dfd6f1f50c189d1ce5eb5cc2c609c;hb=27cee20f365aa2862417a15f29b1ff000d3e4b1f;hp=6dd2316fb132acd40d9640d8e5a142594f426eb7;hpb=93b797fef8f0f190899a305909b47179801f1eb1;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6dd2316fb..91a759635 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: yangtools-carbon
+    name: yangtools-master
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'master'
-    jdk: openjdk8
+    project: yangtools
+    project-name: yangtools
+    branch: master
+    stream: master
+
     jdks:
       - openjdk8
     maven:
@@ -22,69 +19,77 @@
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
+    mvn-version: mvn33
+
+    dependencies: ''
+    email-upstream: '[yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
-    name: yangtools-boron
+    name: yangtools-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'v1.2.x'
+    distribution_branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
-      - mvn32:
-          mvn-version: 'mvn32'
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
-    name: yangtools-beryllium
+    name: yangtools-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
-      - mvn32:
-          mvn-version: 'mvn32'
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-sonar
     jobs: