X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=524d4136b5946b19ea7540b4c735098bcff4441b;hb=refs%2Fchanges%2F37%2F91937%2F4;hp=162dd443f34d3be4be7cf058555518727f8c0b93;hpb=07c3692b89feb6f54df9899f7ee89e0bf6d640fa;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 162dd443f..524d4136b 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: usc-magnesium
+    name: usc-silicon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: silicon
     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]'
 
@@ -19,18 +19,18 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-sodium
+    name: usc-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/sodium'
+    branch: 'stable/aluminium'
     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]'
 
@@ -38,18 +38,18 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-neon
+    name: usc-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/neon'
+    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]'
 
@@ -57,24 +57,35 @@
     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'
+    mvn-opts: '-Xmx1024m'
     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-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: usc
+    project-name: usc
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: usc-settings
+
 - project:
     name: usc-sonar
     jobs:
@@ -84,7 +95,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