Fix mdsal distribution-check neon clone branch

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index e383c3c15c4d4dc0847fb42612b45e9a30a0858c..3a7fa59e597388a54a40aec41494d5f7dc7684c2 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,72 +1,121 @@
 ---
 - project:
-    name: mdsal-oxygen
+    name: mdsal-master
+    jobs:
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{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
+
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    stream: master
+
+    mvn-settings: 'mdsal-settings'
+    mvn-opts: '-Xmx2048m'
+
+    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
+
+- project:
+    name: mdsal-neon
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+          distribution_branch: master
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{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
 
-    stream: oxygen
+    stream: neon
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'master'
+    branch: 'v2.6.x'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    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: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-nitrogen
+    name: mdsal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{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
 
-    stream: nitrogen
+    stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-8c-8g
+    branch: 'stable/fluorine'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    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: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-carbon
+    name: mdsal-oxygen
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{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
 
-    stream: carbon
+    stream: oxygen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-8c-8g
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    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: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -81,4 +130,10 @@
     build-node: centos7-builder-8c-8g
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
+
+- view:
+    name: mdsal
+    description: 'List of mdsal jobs'
+    regex: '^mdsal-.*'
+    <<: *releng_view_common