Merge "Replace `` cmd substitution with $()"

[releng/builder.git] / jjb / alto / alto-csit-setup.yaml

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index e550286146f75a6d491a6d7474fb2c3a77503de9..a1c337240a7dfc99e5420447202e3abd11781e3b 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: alto-csit-setup
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'alto'
@@ -11,30 +12,30 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-alto-resourcepool,odl-restconf-all'
+    install-features: 'odl-alto-resourcepool,odl-restconf-all,odl-alto-basic'
 
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'alto-distribution-{stream}'
-
     # Don't spin up mininet vms as alto-csit-setup jobs don't need them
-    mininet-vms: 0
+    tools_system_count: 0