Adjust for karaf 4 not happening in carbon

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

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index dc85076e84672cdaa323e52b43c25c267d900620..6d8aede2ce0566895c83e3e2ce55fc628d5a2baf 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,21 +1,53 @@
+---
+- project:
+    name: federation-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
+      - '{project-name}-validate-autorelease-{stream}'
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'federation-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: federation-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
 
     project: 'federation'
     project-name: 'federation'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'federation-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -26,7 +58,7 @@
 - project:
     name: federation-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
 
     project: 'federation'
     project-name: 'federation'