Merge "Remove odlparent-3.0.x jobs"

[releng/builder.git] / jjb / usc / usc-csit-tcp.yaml

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 2ec189879cf3e928867d9c0ac8dfcb63b16408ad..53cd5aa8dce7b068dfcec6a1123edf2f467f8e36 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-tcp
     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,16 +13,17 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all: