Update sonar jobs to global-jjb

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

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 87112e490c4315fd96427b33ba2dd0c79fb82ae5..53d72fc8b9caf37880af39291ee140524dda0f57 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -3,33 +3,39 @@
 - project:
     name: distribution
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
-      - '{project-name}-validate-autorelease-{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-tox-verify
+
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[int/dist]'
 
     stream:
+      - oxygen:
+          branch: master
+      - nitrogen:
+          branch: stable/nitrogen
       - carbon:
-          branch: 'master'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-            - openjdk7
+          branch: stable/carbon
+          karaf-version: karaf3
 
-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+- 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'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'