X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=81cee7fafded8c86f16a155a536e857bced32856;hb=ed931c6f4a078f855ecf8781381f555fb285f61d;hp=e447eca17d0b94d2dc0a23fdbfbc315c0a6c782f;hpb=28c73057560c34d1fadad99c702461cdb8c9f0c7;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e447eca17..81cee7faf 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,11 +1,13 @@
 ---
 - project:
-    name: usc-fluorine
+    name: usc-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -18,16 +20,35 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
+    name: usc-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: sodium
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'stable/sodium'
+    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-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: neon
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/oxygen'
+    branch: 'stable/neon'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -37,16 +58,16 @@
     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
+      - odl-maven-verify-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}'
@@ -59,8 +80,15 @@
     name: usc-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: usc-view
+    views:
+      - project-view
+    project-name: usc