X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnbi%2Fsnbi.yaml;h=045e7a8a28d8f6ad0fc760e112cad9bd92f95d47;hb=be7a8017f315c16dab31639d554169d899daf1ce;hp=3a47480fadd9ceccc24e663d79428f154633496d;hpb=482eb559cce738749ed152a72bd28b279e4c7edf;p=releng%2Fbuilder.git

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 3a47480fa..045e7a8a2 100644
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -1,82 +1,53 @@
 ---
 - project:
-    name: snbi-oxygen
+    name: snbi-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
 
 - project:
-    name: snbi-nitrogen
+    name: snbi-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
 
 - project:
-    name: snbi-carbon
+    name: snbi-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
@@ -84,10 +55,9 @@
 - project:
     name: snbi-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'