Merge "Switch all projects to use new maven-merge job"

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 61bed1501b377ea64fd6525cf5fbab322bc2032c..327799ab2137ce68c02ab6a23ac2a7509a5fc2e8 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,13 +2,10 @@
 - project:
     name: controller-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-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'controller'
@@ -22,18 +19,20 @@
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-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-jobs'
 
     stream: nitrogen
     project: 'controller'
@@ -51,14 +50,15 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-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-jobs'
 
     stream: carbon
     project: 'controller'
@@ -77,10 +77,13 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'controller'
     project-name: 'controller'