Add missing chlorine branch

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 19f56c546723dd7af719284ef012f2780e286a3d..07696753bfc4d1accec3153b4e15a1b948911a0f 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,12 +24,18 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
       - phosphorus:
           branch: "stable/phosphorus"
+          mvn-version: mvn35
       - silicon:
           branch: "stable/silicon"
+          mvn-version: mvn35
 
 - project:
     name: distribution-managed
@@ -55,32 +61,39 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+          dependencies: >
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
       - phosphorus:
           branch: "stable/phosphorus"
+          mvn-version: mvn35
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
       - silicon:
           branch: "stable/silicon"
+          mvn-version: mvn35
           dependencies: >
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
@@ -113,16 +126,24 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+          dependencies: >
+            distribution-merge-managed-{stream},
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
       - phosphorus:
           branch: "stable/phosphorus"
+          mvn-version: mvn35
           dependencies: >
             distribution-merge-managed-{stream},
       - silicon:
           branch: "stable/silicon"
+          mvn-version: mvn35
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -145,12 +166,18 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
       - phosphorus:
           branch: "stable/phosphorus"
+          mvn-version: mvn35
       - silicon:
           branch: "stable/silicon"
+          mvn-version: mvn35
 
 - project:
     name: distribution-sonar