X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flispflowmapping%2Flispflowmapping.yaml;h=c53390e0148b128d0562cb68c5923e18b67c2f03;hb=3ecaa689e0e0614b033c31bc87ddd595ca877e9a;hp=a4bc1ffa4db8a29b95944484fe767bcb1444a584;hpb=4672451255ec3c82e1782e5abc6f0b7e246d1d13;p=releng%2Fbuilder.git

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index a4bc1ffa4..c53390e01 100644
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: lispflowmapping-magnesium
+    name: lispflowmapping-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -9,19 +9,17 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk8
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    mvn-goals: 'clean deploy -DrepoBuild'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: >
@@ -34,7 +32,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-sodium
+    name: lispflowmapping-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -43,19 +41,17 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk8
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    mvn-goals: 'clean deploy -DrepoBuild'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: >
@@ -68,7 +64,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-neon
+    name: lispflowmapping-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -81,46 +77,14 @@
       - odl-maven-verify-jobs:
           java-version:
             - openjdk8
-            - openjdk11
-
-    stream: neon
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/neon'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: >
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: lispflowmapping
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
-          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
+    stream: sodium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: >
@@ -139,9 +103,19 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    mvn-goals: 'clean deploy -DrepoBuild'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+
+- project:
+    name: lispflowmapping-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: lispflowmapping
+    project-name: lispflowmapping
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: lispflowmapping-view