Merge "Update cloud image list docs"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 93012b2b5409ccf099ff440bfcea8118c4884c1b..18fe76b5ac6338766953a87d05c1ae4eb561ffab 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,9 +2,7 @@
 - project:
     name: mdsal-master
     jobs:
-      - 'gerrit-release-merge':
-          build-node: centos7-builder-2c-2g
-      - '{project-name}-rtd-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/
@@ -17,18 +15,50 @@
     branch: master
     stream: master
 
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-version: mvn36
+    build-timeout: 90
+
+    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-6.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: 6.0.x
+    stream: 6.0.x
+
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
     mvn-version: mvn36
     build-timeout: 90
 
     archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.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
@@ -36,7 +66,7 @@
 - project:
     name: mdsal-5.0.x
     jobs:
-      - '{project-name}-rtd-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/
@@ -49,20 +79,20 @@
     branch: 5.0.x
     stream: 5.0.x
 
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-opts: "-Xmx2048m"
     build-timeout: 90
 
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    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
+      **/*.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
@@ -70,7 +100,7 @@
 - project:
     name: mdsal-v4.0.x
     jobs:
-      - '{project-name}-rtd-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/
@@ -83,23 +113,34 @@
     branch: v4.0.x
     stream: v4.0.x
 
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-settings: "mdsal-settings"
+    mvn-opts: "-Xmx2048m"
     build-timeout: 90
 
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    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
+      **/*.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-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: mdsal
+    project-name: mdsal
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: mdsal-settings
+
 - project:
     name: mdsal-sonar
     jobs:
@@ -109,18 +150,26 @@
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
 
-    project: 'mdsal'
-    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'
+    project: "mdsal"
+    project-name: "mdsal"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-goals: "-Dmaven.compile.fork=true clean deploy -Dintegrationtests"
+    mvn-opts: "-Xmx2048m"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+
+- project:
+    name: mdsal-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: mdsal-view