X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyang-push%2Fyang-push.yaml;h=31b89fdec28bd5ac2b10af1a7f06e754cde78362;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=86cea4e0cbbec1cafbf6be5da0da2d7bce75b194;hpb=dfb28dd0bac7379c599a82795fbae7d9747f9c47;p=releng%2Fbuilder.git

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 86cea4e0c..bd8a0ba42 100644
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,80 +1,68 @@
-# 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
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     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-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
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+    branch: 'stable/nitrogen'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     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-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
+    mvn-settings: 'yang-push-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[yang-push]'
+
+    # 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'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'