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 ab5cbbf626328c963245b077b4cb83bc09009100..057e71ce5d63d2851cd9e8fcc664506a2154aea0 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,34 +1,41 @@
+---
 # ODL Releng build templates
 - project:
     name: distribution
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
+      # {project-name}- is generic template, distribution- is project specific.
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-sonar'
+      - '{project-name}-validate-autorelease-{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'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
-            disable_autorelease: False
-            disable_distribution_check: False
-
-    project: 'integration/distribution'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    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}'
+    dependencies: ''
     email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'
+    jdk: openjdk8
+    jre: openjdk8
+
+    stream:
+      - nitrogen:
+          branch: master
+      - carbon:
+          branch: stable/carbon
+          karaf-version: karaf3
+      - boron:
+          branch: stable/boron
+          karaf-version: karaf3
+      - beryllium:
+          branch: stable/beryllium
+          karaf-version: karaf3