X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fmdsal%2Fmdsal.yaml;h=42c96da4eca5b3d3195911c3d172d30e2c0cbfff;hb=ebf97a45fa6d937ed300d4235b3eb7776f4876fa;hp=67c1967d1c53533af392ce3938821d984c940750;hpb=4672451255ec3c82e1782e5abc6f0b7e246d1d13;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 67c1967d1..42c96da4e 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,21 +2,21 @@
 - project:
     name: mdsal-master
     jobs:
+      - 'gerrit-release-merge'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
-      - odl-maven-jobs
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
 
@@ -97,34 +97,6 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: mdsal
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
-          rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/fluorine'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-sonar
     jobs:
@@ -138,6 +110,7 @@
     project-name: 'mdsal'
     branch: 'master'
     build-node: centos7-builder-8c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'