X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=1e31b30a432ce77caed8340d8fe35ca5cb0d1c76;hb=e47a8ddb18b82790e048d312170c643c3a251dd8;hp=b11b299d81546a4a19b9679df86399bcf8e23b47;hpb=b3d9042ef1e3c22e8b792ce01e9659d1cb683f1b;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index b11b299d8..1e31b30a4 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: usc-fluorine
+    name: usc-neon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -18,35 +18,15 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/oxygen'
-    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-nitrogen
+    name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -56,17 +36,16 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-carbon
+    name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -84,3 +63,9 @@
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: usc
+    description: 'List of usc jobs'
+    regex: '^usc-.*'
+    <<: *releng_view_common