Feat: Branch cut stable/chlorine stream

[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 39af018ca5b6806f48c934e1792bace26bffe4f2..a6d755ed6839a036734dd829e0383bcf8e3f6c65 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -26,10 +26,13 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
+          java-version: openjdk11
       - phosphorus:
           branch: "stable/phosphorus"
           mvn-version: mvn35
@@ -61,7 +64,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             daexim-maven-merge-{stream},
@@ -70,6 +73,15 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
+      - chlorine:
+          branch: "stable/chlorine"
+          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"
           java-version: "openjdk11"
@@ -115,10 +127,14 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
+      - chlorine:
+          branch: "stable/chlorine"
+          dependencies: >
+            distribution-merge-managed-{stream},
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -152,8 +168,10 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -211,8 +229,10 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
       - phosphorus: