X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=ea767f6e9ffeac6f7ba38acb4c1e6bbd1ee405c7;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=51513b7c17dc7c52040884c909f7511a5ebdc6eb;hpb=1a0c6f5da25a278ae613290d432fa66c4939f85a;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 51513b7c1..ea767f6e9 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,88 +1,45 @@
 ---
 - project:
-    name: faas-oxygen
+    name: faas-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    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-nitrogen
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: faas-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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: ''
+
+    # 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'