Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e5e85565766d58ddd105708b37675e3bab1fee9d..86b4017fef51d6c38652123f26ac34f79140b756 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -2,17 +2,15 @@
 - project:
     name: usc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,10 +78,13 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'usc'
     project-name: 'usc'
     branch: 'master'