Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index ee4dac3d4367506fbf7cfc00930ae48521f42d11..79e498ce1cbdfdbed60c5d9960480f61917722c4 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,12 +2,10 @@
 - project:
     name: mdsal-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'mdsal'
@@ -21,18 +19,21 @@
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    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
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'mdsal'
@@ -50,14 +51,16 @@
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'mdsal'
@@ -76,10 +79,13 @@
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'