X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyang-push%2Fyang-push.yaml;h=557b84d28a9331fb00926ec09c1672becf1ffa9b;hb=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;hp=63fe404e5c87e8b82e2817bca1d01041ea8ca74a;hpb=9b34da5281efb50b64fec99422cbaf4b4908f19a;p=releng%2Fbuilder.git

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 63fe404e5..fc38e865b 100644
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,31 +1,20 @@
-# ODL Releng build templates
+---
 - project:
-    name: yang-push-boron
+    name: yang-push-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: oxygen
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -33,34 +22,25 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
-    name: yang-push-beryllium
+    name: yang-push-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-      - beryllium:
-          disable_autorelease: False
-          disable_distribution_check: False
+    stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/nitrogen'
     jdks:
-      - openjdk7
       - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -68,10 +48,40 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
+- project:
+    name: yang-push-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yang-push-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[yang-push]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'