X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=78631d214483fa96dcb6bc78a0f827e95912b9ba;hb=ccaff4b13a69a8e501cbf672f2f45241cd7ec909;hp=d1d416c00fe63684cdf5b457d94ce7744e412a25;hpb=0ee3c05331b174e1be5d2adad43b9bdaae50ffb1;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index d1d416c00..78631d214 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: controller-nitrogen
+    name: controller-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -22,26 +19,25 @@
     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-carbon
+    name: controller-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,22 +50,21 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
-    name: controller-boron
+    name: controller-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -82,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'