Merge "move network id to local jenkins configuration managed files"

[releng/builder.git] / jjb / capwap / capwap-csit-ac.yaml

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 63e7fd08ddadfb24761a5fd7493d93831feb735e..70c1cf0f3a369b93e72ff3a46b6db55b4ee671a6 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},odlparent-distribution-{stream},capwap-distribution-{stream}'