Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-sxp.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 096dfb405b9703070b8c98f91c7bd3ef0ae62b21..9116b0307e2ecba04d5b5f948d0acb4702c299e2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: groupbasedpolicy-csit-sxp
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-   # The project name
+      - inttest-csit-1node
+    # The project name
     project: 'groupbasedpolicy'
 
     # The functionality under test
@@ -10,22 +11,29 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # Mininet configuration (TOOLS)
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
-    install-features: 'odl-restconf,odl-groupbasedpolicy-sxp-ise-adapter,odl-groupbasedpolicy-ne-location-provider,odl-groupbasedpolicy-ios-xe,odl-sfc-ios-xe-renderer,odl-sxp-controller'
+    install-features: >
+        odl-restconf,
+        odl-groupbasedpolicy-sxp-ise-adapter,
+        odl-groupbasedpolicy-ne-location-provider,
+        odl-groupbasedpolicy-ios-xe,
+        odl-sfc-ios-xe-renderer,
+        odl-sxp-controller
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'sfc-distribution-{stream},groupbasedpolicy-distribution-{stream},sxp-distribution-{stream}'