Clean up log file size increase logic

[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 e6d5806a4d915966f2ccf508d0f022355353b0e6..772ba0750bc1301e466e7bb0a21d78c6080cc4bc 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,9 +21,12 @@
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          karaf-version: odl
+      - magnesium:
+          branch: 'stable/magnesium'
           jre: 'openjdk11'
           karaf-version: odl
       - sodium:
@@ -69,7 +72,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           jre: 'openjdk11'
@@ -88,6 +91,25 @@
               openflowplugin-maven-merge-{stream},
               ovsdb-maven-merge-{stream},
               serviceutils-maven-merge-{stream},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
       - sodium:
           branch: 'stable/sodium'
           dependencies: >
@@ -146,12 +168,18 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
       - sodium:
           branch: 'stable/sodium'
           karaf-version: odl
@@ -183,9 +211,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon: