Merge "Add new job template, macro and jenkins job for SFC with docker"

[releng/builder.git] / jjb / nemo / nemo-csit-engine.yaml

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index f9c106af0933fc8ff6cb6c9eb686470c5af5d1df..dc6a21119fa1161f17a75dbacb51d5fc43398581 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -12,12 +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'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -26,10 +29,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui'
+    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui,odl-nemo-openflow-renderer'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},nemo-distribution-{stream}'
+    trigger-jobs: 'nemo-distribution-{stream}'