X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=ff630de93e7bd03779eec8e4f2f55e7d594fd7c2;hb=052c78f537806c396d05f0d2d5ad930b48cd839a;hp=25ca0336e248f093f5c0ac452a4d2467de4abbf6;hpb=791e15fc91060bb48fe8b4c8585df97fccfc136e;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 25ca0336e..ff630de93 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,41 +1,93 @@
-# ODL Releng build templates
+---
 - project:
-    name: faas
+    name: faas-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # 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: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'faas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+    archive-artifacts: ''
+
+- project:
+    name: faas-boron
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: boron
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'stable/boron'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'faas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+    archive-artifacts: ''
+
+- project:
+    name: faas-beryllium
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
+    stream: beryllium
     project: 'faas'
     project-name: 'faas'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
     archive-artifacts: ''
+
+- project:
+    name: faas-sonar
+    jobs:
+      - '{project-name}-sonar'
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    mvn-settings: 'faas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'