Merge "Upgrade OVS dep for opflex from 2.6.7 to 2.12.0"

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e447eca17d0b94d2dc0a23fdbfbc315c0a6c782f..e069737627638e8aa98520c8219b7a940af513ab 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,16 +1,18 @@
 ---
 - 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'
     mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
 
@@ -18,18 +20,18 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
+    name: usc-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
 
@@ -37,18 +39,18 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-nitrogen
+    name: usc-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: nitrogen
+    stream: neon
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/nitrogen'
+    branch: 'stable/neon'
     mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
 
@@ -59,8 +61,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'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: usc-view
+    views:
+      - project-view
+    project-name: usc