Update Ubuntu docker image

[releng/builder.git] / jjb / integration / distribution / distribution.yaml

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 0504f748a46941fc1deb0e71a5e8a848dadc0179..1ae14cc0bd486ecfdbfceb8178a65cc9127b5bbe 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,17 +1,20 @@
 ---
-# ODL Releng build templates
 - project:
     name: distribution
     jobs:
-      # {project-name}- is generic template, distribution- is project specific.
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
-      - '{project-name}-verify-tox-{stream}'
+      # gerrit- is generic template, distribution- is project specific.
       - 'distribution-merge-{stream}'
       - 'distribution-verify-{stream}'
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
+      - '{project-name}-rtd-jobs':
+          project-pattern: integration/distribution
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
+          rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
 
     project: integration/distribution
     project-name: distribution
@@ -20,15 +23,22 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[int/dist]'
-    jdk: openjdk8
-    jre: openjdk8
 
     stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: master
-      - carbon:
-          branch: stable/carbon
-          karaf-version: karaf3
-      - boron:
-          branch: stable/boron
-          karaf-version: karaf3
+          branch: 'stable/nitrogen'
+
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'