Merge "Remove messaging4transport carbon jobs"

[releng/builder.git] / jjb / yang-push / yang-push.yaml

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index c533c444c3e66453f0444e02665163f7ace98dc2..d943a07e516011d13afa23c40a9af6094410ead3 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: yang-push-oxygen
+    name: yang-push-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
@@ -18,15 +17,15 @@
     staging-profile-id: a69aae2832869
 
 - project:
-    name: yang-push-nitrogen
+    name: yang-push-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'yang-push-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -36,16 +35,15 @@
     staging-profile-id: a69aae2832869
 
 - project:
-    name: yang-push-carbon
+    name: yang-push-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'yang-push-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''