X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=9a93d7571a1bb7f00ba399506cd9ddd5f287c391;hb=a87fca6f6aa3b263d1695a568708c247cb5ed604;hp=2675421c0ecc81239f1992681ffa6410f320d322;hpb=79c0ee538aea4c11720752b23f5416a344f30d2e;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 2675421c0..9a93d7571 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,34 +1,18 @@
 ---
 - project:
-    name: usc-sodium
+    name: usc-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     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-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'usc'
-    project-name: 'usc'
-    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]'
 
@@ -36,17 +20,18 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-fluorine
+    name: usc-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/fluorine'
+    branch: 'stable/magnesium'
     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]'
 
@@ -54,21 +39,20 @@
     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]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
@@ -82,7 +66,20 @@
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: usc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: usc
+    project-name: usc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: usc-view