Adjust for karaf 4 not happening in carbon

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

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index b9ff74d8af2246c9edc2dfb3213e5b15154e2231..057e71ce5d63d2851cd9e8fcc664506a2154aea0 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -3,37 +3,39 @@
 - project:
     name: distribution
     jobs:
+      # {project-name}- is generic template, distribution- is project specific.
       - '{project-name}-clm-{stream}'
       - '{project-name}-sonar'
       - '{project-name}-validate-autorelease-{stream}'
-      - distribution-check-{stream}
+      - '{project-name}-verify-tox-{stream}'
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-deploy-{stream}'
+      - 'distribution-offline-{stream}'
+      - 'distribution-check-{stream}'
+      - 'distribution3-deploy-nitrogen'
+      - 'distribution3-offline-nitrogen'
+      - 'distribution3-check-nitrogen'
+
+    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]'
+    jdk: openjdk8
+    jre: openjdk8
 
     stream:
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          branch: master
       - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          branch: stable/carbon
+          karaf-version: karaf3
       - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          branch: stable/boron
+          karaf-version: karaf3
       - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-            - openjdk7
-
-    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: 'odlparent-merge-{stream}'
-    email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'
+          branch: stable/beryllium
+          karaf-version: karaf3