X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyang-push%2Fyang-push.yaml;h=8a775119ab876e765c251237c39c817bddd2a9a4;hb=b3d9042ef1e3c22e8b792ce01e9659d1cb683f1b;hp=e4e8812d6f047a07f349e072b12cbbec530c80bc;hpb=bd725532d0ee35b70923351b6812fdfe872f4655;p=releng%2Fbuilder.git

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index e4e8812d6..8a775119a 100644
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,91 +1,82 @@
 ---
 - project:
-    name: yang-push-nitrogen
+    name: yang-push-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     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'
     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
+    name: yang-push-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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-boron
+    name: yang-push-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
+    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-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    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'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'