Merge "Add lf-infra-pre-build to opflex custom jobs"

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index a8fb8b199092a06ec470eae310c2ddbb9d33ec9c..81cee7fafded8c86f16a155a536e857bced32856 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,11 +1,13 @@
 ---
 - project:
-    name: usc-neon
+    name: usc-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -18,15 +20,16 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-fluorine
+    name: usc-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -36,16 +39,35 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
+    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}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
+- project:
+    name: usc-fluorine
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: fluorine
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'stable/fluorine'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'