Manage ODL Jenkins views with view-templates

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index b11b299d81546a4a19b9679df86399bcf8e23b47..a8fb8b199092a06ec470eae310c2ddbb9d33ec9c 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: usc-fluorine
+    name: usc-neon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -18,35 +18,15 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/oxygen'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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-nitrogen
+    name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -56,17 +36,16 @@
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-carbon
+    name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -79,8 +58,15 @@
     name: usc-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: usc-view
+    views:
+      - project-view
+    project-name: usc