X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-sxp.yaml;h=9116b0307e2ecba04d5b5f948d0acb4702c299e2;hb=4ef2a863969dc4eda8c16975c8d11f7af0bdd565;hp=b52e564aea52d93069dfd8f2b4d2b572aedf02d5;hpb=09e4fc79276df8643bec4fbaa56ee919a516a23e;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index b52e564ae..9116b0307 100644
--- 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'
+    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}'