Merge "Remove all refs to nitrogen from int/dist"

[releng/builder.git] / jjb / unimgr / unimgr-csit-legato.yaml

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index c479fac5a2950ed97b9872e751e2ac39c7731b22..c221e79d595b8663a5b0745a34d5a5ac4a8f1dfe 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: unimgr-csit-legato
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
@@ -12,21 +13,15 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-unimgr-ui,odl-unimgr-netvirt'
@@ -35,7 +30,4 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream},netvirt-distribution-{stream},genius-distribution-{stream}'
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847