X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fusc%2Fusc-csit-channel.yaml;h=0ef3a94d96a5ce3a41e627cb780c748603ef2c2e;hb=fd30d76b2e0783f0cd3a1da4d473c8bc0906da0a;hp=bfb25dd190e00a864c4757bc7be44870261a83da;hpb=4aaa45a1cafdf3191f28a3885a7010fa966a6bda;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index bfb25dd19..0ef3a94d9 100644
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-channel
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'
@@ -13,24 +13,17 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'