X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=34866f95158e3df03e2d854a4e778938bd756d9d;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=b2cfdfe87d1c835516d3c837d91d56e8ee073c63;hpb=d7811c62d1c2d19a4746455ddc8eda1a8f68664f;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index b2cfdfe87..34866f951 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,18 +1,16 @@
 ---
 - project:
-    name: yangtools-oxygen
+    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}-verify-{stream}-{maven}-{jdks}'
 
-    stream: oxygen
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'master'
-    jdk: openjdk8
+    project: yangtools
+    project-name: yangtools
+    branch: master
+    stream: master
+
     jdks:
       - openjdk8
     maven:
@@ -21,25 +19,29 @@
     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-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}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'v1.2.x'
     distribution_branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -48,25 +50,29 @@
     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-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}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,43 +81,19 @@
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
+    mvn-version: mvn33
 
-- project:
-    name: yangtools-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    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'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangtools'
     project-name: 'yangtools'