Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

[releng/builder.git] / jjb / sxp / sxp.yaml

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index bbc06bd2ed36f7a8dc152a72eccc1fca24b27bd0..08b5b7556db68a1ae56d50399cb0de0d33ca65c4 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,20 +1,36 @@
 ---
+- project:
+    name: sxp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -23,7 +39,6 @@
     name: sxp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +49,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -43,7 +57,6 @@
     name: sxp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +68,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7