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 aa385c0570c02ab81161e670879c5be606bbe8dd..772ba0750bc1301e466e7bb0a21d78c6080cc4bc 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,9 +21,13 @@
     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:
           branch: 'stable/sodium'
@@ -68,19 +72,38 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           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},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
           dependencies: >
               aaa-maven-merge-{stream},
               bgpcep-maven-merge-{stream},
-              coe-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},
-              mdsal-maven-merge-{stream},
               netconf-maven-merge-{stream},
               netvirt-maven-merge-{stream}
               neutron-maven-merge-{stream},
@@ -98,7 +121,6 @@
               genius-merge-{stream},
               infrautils-merge-{stream},
               lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
               netconf-merge-{stream},
               netvirt-merge-{stream}
               neutron-merge-{stream},
@@ -117,7 +139,6 @@
               genius-merge-{stream},
               infrautils-merge-{stream},
               lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
               netconf-merge-{stream},
               netvirt-merge-{stream}
               neutron-merge-{stream},
@@ -147,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
@@ -175,7 +202,7 @@
 
     project: 'integration/distribution'
     project-name: 'distribution'
-    mvn-goals: 'clean deploy -f onap-karaf/pom.xml'
+    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
     mvn-settings: 'integration-distribution-settings'
     mvn-opts: '-Xmx1024m'
     email-upstream: '[int/dist]'
@@ -184,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: