Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 7c227dd5845ac8c2a065e17d6db6b71d83b88a43..a964198314f5a37afa5b5ed291f5b53e29ebed17 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -25,10 +28,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-all'
+    install-features: 'odl-restconf,odl-sxp-controller'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'