Switch the csit-1node to use job prefix

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

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 92fbf0b491a353f423910c66f106601989ff7781..91835fbbbd51050c0e69dae86f184aae4b868d72 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -1,45 +1,35 @@
+---
 - project:
-    name: unimgr-csit
+    name: unimgr-csit-basic
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
 
     # The functionality under test
-    functionality:
-        - basic:
-            functionality: 'basic'
-        - legato:
-            functionality: 'legato'
+    functionality: 'basic'
 
-    #  Project branches
+    # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     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'
+    install-features: 'odl-unimgr-ui'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream}'