Remove all Oxygen Jobs.

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 7cd63e38405e9c5edf7a5361f97369f92afe1228..2115e9bbe726a97508ab162cca1b4c5ecfe1f2e7 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: controller-neon
+    name: controller-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -11,7 +11,7 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
@@ -27,7 +27,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-fluorine
+    name: controller-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -38,10 +38,10 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -54,16 +54,21 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-oxygen
+    name: controller-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: controller
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -78,7 +83,10 @@
 - project:
     name: controller-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'controller'
     project-name: 'controller'