Merge changes from topic 'improve-linting'

[releng/builder.git] / jjb / netconf / netconf-clustering.yaml

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index fb2e6e3b80d6a74c161e3ffa6ea34061eec0846d..0f24660244501c70661866b3fabc29dfc833e36c 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -11,12 +11,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'