X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=5360a15d9f889e91d69bf23e8141d928251ee84f;hb=ee7cc49030e1db13e37aacca8db6e4a300225aee;hp=9a93d7571a1bb7f00ba399506cd9ddd5f287c391;hpb=17e405080849c714581eaeb98ad4b20dae1f3ea9;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 9a93d7571..5360a15d9 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,76 +1,86 @@
 ---
 - project:
-    name: usc-aluminium
+    name: usc-phosphorus
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - gerrit-release-merge
+      - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'master'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    stream: phosphorus
+    project: "usc"
+    project-name: "usc"
+    branch: "master"
+    mvn-settings: "usc-settings"
+    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-magnesium
+    name: usc-silicon
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/magnesium'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    stream: silicon
+    project: "usc"
+    project-name: "usc"
+    branch: "stable/silicon"
+    mvn-settings: "usc-settings"
+    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-sodium
+    name: usc-aluminium
     jobs:
-      - '{project-name}-maven-javadoc-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'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    stream: aluminium
+    project: "usc"
+    project-name: "usc"
+    branch: "stable/aluminium"
+    mvn-settings: "usc-settings"
+    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:
       - gerrit-maven-sonar
 
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'master'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "usc"
+    project-name: "usc"
+    branch: "master"
+    mvn-settings: "usc-settings"
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: usc-info