Merge "Remove mdsal-5.0.x jobs"

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7a0bc0e3215bcfb4e19f4cf87edad29ee9535878..5360a15d9f889e91d69bf23e8141d928251ee84f 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: usc-silicon
+    name: usc-phosphorus
     jobs:
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "usc"
     project-name: "usc"
     branch: "master"
@@ -19,35 +19,16 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-aluminium
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    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-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: "stable/magnesium"
+    branch: "stable/silicon"
     mvn-settings: "usc-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
@@ -57,16 +38,16 @@
     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"
     dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"