X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyang-push%2Fyang-push.yaml;h=d943a07e516011d13afa23c40a9af6094410ead3;hb=5977e805e57da4ce9877ac5e4a5d38db7fef5abd;hp=1b1bd5aee339c2415a21248ac685f92ed9029b09;hpb=8d243725f9df82c5e54137008a87d27c1de10265;p=releng%2Fbuilder.git

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 1b1bd5aee..d943a07e5 100644
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,82 +1,53 @@
 ---
 - project:
-    name: yang-push-oxygen
+    name: yang-push-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
-    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-nitrogen
+    name: yang-push-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: yang-push-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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
@@ -84,10 +55,9 @@
 - 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'