Merge "Revert "Update the Ubuntu 16.04 kubernetes images""

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 98d4f58faa1d4f9102d0f5ae8a42eba6a43e005d..bbebed1cae220bcb17c3899b888de35ddd5e6f16 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,14 +1,42 @@
 ---
+- project:
+    name: aaa-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs
 
     stream: neon
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -21,6 +49,11 @@
     name: aaa-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs
 
     stream: fluorine
@@ -41,6 +74,7 @@
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
+    disable-job: true
     stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
@@ -56,7 +90,10 @@
 - project:
     name: aaa-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: 'aaa'
     project-name: 'aaa'
@@ -64,8 +101,8 @@
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: aaa
-    description: 'List of aaa jobs'
-    regex: '^aaa-.*'
-    <<: *releng_view_common
+- project:
+    name: aaa-view
+    views:
+      - project-view
+    project-name: aaa