Merge "Add stein devstack jobs"

[releng/builder.git] / jjb / mdsal / mdsal.yaml

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index fcda1efea719a645674de782624fc9affa18a86e..cf2e9b68d16a5a7b824ddc7f92333c607dbb700d 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,18 +2,51 @@
 - 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-jobs-jdk11
+      - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
+    mvn-settings: 'mdsal-settings'
+
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
+- project:
+    name: mdsal-5.0.x
+    jobs:
+      - '{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-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 5.0.x
+    stream: 5.0.x
+
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
 
@@ -31,7 +64,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-3.0.x
+    name: mdsal-v4.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -39,11 +72,12 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
-    branch: v3.0.x
-    stream: v3.0.x
+    branch: v4.0.x
+    stream: v4.0.x
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
@@ -62,28 +96,33 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-fluorine
+    name: mdsal-3.0.x
     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
+
+    project: mdsal
+    project-name: mdsal
+    branch: v3.0.x
+    stream: v3.0.x
 
-    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]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -101,6 +140,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'