Switch global-jjb jobs to use mvn35

[releng/builder.git] / jjb / topoprocessing / topoprocessing.yaml

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 7a382b6795dc22daafef12993a635328f93aa4ea..8aacb504110802c81b455ff521d4aa3eae1d480f 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -1,15 +1,32 @@
 ---
+- project:
+    name: topoprocessing-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    mvn-settings: 'topoprocessing-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'topoprocessing-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -22,7 +39,6 @@
     name: topoprocessing-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +57,6 @@
     name: topoprocessing-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon