X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=f7dfeb8c561c68ddf99d28c043c91e79e9b29049;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=7ab9c71b68f833a67cee6952d54f70e542db6fe8;hpb=63ecbdec7e9b945d75d5a4476571dba63a832590;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7ab9c71b6..f7dfeb8c5 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,82 +1,37 @@
 ---
 - project:
-    name: usc-oxygen
+    name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
-    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-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-maven-javadoc-jobs'
-
-    stream: nitrogen
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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
@@ -89,5 +44,4 @@
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'