X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=f9e4ddfd2d65e4b89aea2c189198ff8593dd8694;hb=8b7be10bfe9675347ac52966a547ed66700337f8;hp=00fe1614fbb7351e7943637ad358a8e6d8b6b20f;hpb=0023b8933880f4e6428f1cc4a5445470116a9f7d;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 00fe1614f..f9e4ddfd2 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,23 +1,23 @@
+---
 - project:
-    name: faas-carbon
+    name: faas-oxygen
     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}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: oxygen
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -26,25 +26,24 @@
     archive-artifacts: ''
 
 - project:
-    name: faas-boron
+    name: faas-nitrogen
     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}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -53,26 +52,25 @@
     archive-artifacts: ''
 
 - project:
-    name: faas-beryllium
+    name: faas-carbon
     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}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -83,7 +81,7 @@
 - project:
     name: faas-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'faas'
     project-name: 'faas'
     branch: 'master'