X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=1a66df1d78ca4215e55027e94927bd6957157c93;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=7798961f115a961b266d3940248182d39c395166;hpb=90a7b08bb7ef2cbbf24b5ba84c368d6b6576276b;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7798961f1..1a66df1d7 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,20 +1,17 @@
 ---
 - project:
-    name: usc-nitrogen
+    name: usc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,50 +24,22 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: usc-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-boron
+    name: usc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -83,24 +52,24 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
-    name: usc-beryllium
+    name: usc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk7
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -112,10 +81,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'