Merge "Remove odlparent-3.0.x jobs"

[releng/builder.git] / jjb / sxp / sxp-csit-basic.yaml

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index a374b66aaf9d862765d98c1c8bd7e1e696c64d40..f10ead2a8a329e5c19345684c7eb437e4ae6add1 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: sxp-csit-basic
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
@@ -11,24 +12,30 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - sodium:
+          branch: 'master'
+      - neon:
+          branch: 'stable/neon'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: true
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options
     robot-options: ''