X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=f9e4ddfd2d65e4b89aea2c189198ff8593dd8694;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=c58cd5e9e37ae3ffded0a3f042a12ac4e70b4778;hpb=396dd1464a4464b6e88a984defd338f4df4dc6e2;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index c58cd5e9e..ea767f6e9 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,110 +1,45 @@
+---
 - project:
-    name: faas-carbon
+    name: faas-fluorine
     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}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: fluorine
     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: ''
+
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
 
 - project:
-    name: faas-boron
+    name: faas-oxygen
     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}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: oxygen
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+    branch: 'stable/oxygen'
     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-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-    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'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
 
 - project:
     name: faas-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'