Only use -all- job if it exists

[releng/builder.git] / jjb / sfc / sfc-csit-full-deploy.yaml

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 69dfee28f4557ea06e90afea24fe0958c5313687..0417bfbeb7622a701a1f354613ac0e8887738ace 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -1,8 +1,8 @@
+---
 - project:
     name: sfc-csit-full-deploy
     jobs:
-        - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
-
+      - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'sfc'
@@ -12,20 +12,30 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - all:
-            scope: 'all'
-
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-sfc-provider-rest'
+    install-features: >
+        odl-sfc-provider,
+        odl-sfc-ui,
+        odl-sfc-openflow-renderer,
+        odl-sfc-scf-openflow,
+        odl-sfc-sb-rest,
+        odl-sfc-ovs,
+        odl-sfc-netconf
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},openflowplugin-distribution-{stream},sfc-distribution-{stream}'