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

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 62be1f4d00a6b0852acd464d83e5512550bd9c3e..772a8d932797bc59816592abedd581a0be2fd931 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,16 +1,34 @@
 ---
+- project:
+    name: usc-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -23,7 +41,6 @@
     name: usc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -43,7 +60,6 @@
     name: usc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs