X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=c2524eaeca7d6f6a7e0c0777ce73fbae2a0a93e6;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=a18d7d4794023e5a389804dca76f11a9a9f8928c;hpb=bffe483d1232226d8d4833a3cb3944b9bfe7331b;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index a18d7d4794..c2524eaeca 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,52 +1,49 @@
+---
 - project:
-    name: controller-carbon
+    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}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: carbon
+    stream: oxygen
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
-    # Temporary workaround for SFT failure with karaf4-features
-    build-node: centos7-java-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-boron
+    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}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: boron
+    stream: nitrogen
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -54,27 +51,27 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
-    name: controller-beryllium
+    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}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: beryllium
+    stream: carbon
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -82,10 +79,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'