Remove nitrogen branches in projects

[releng/builder.git] / jjb / netconf / netconf-userfeatures.yaml

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 5a1b56d9fe4415e839afb78bae23c88670d1d249..9b6af63a8b3a509f1621c33f0fba18695dcbdf9b 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -1,41 +1,38 @@
+---
 - project:
     name: netconf-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
-    # Tools system configuration (formerly "mininet configuration"), this is needed as netopeer is only available in this vm
-    mininet-image: 'rk-c-el6-mininet'
+    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-openflowplugin-all'
+    install-features: >
+        odl-restconf,
+        odl-netconf-mdsal,
+        odl-mdsal-apidocs,
+        odl-clustering-test-app,
+        odl-netconf-topology
 
     # Robot custom options
-    robot-options: '-v NETOPEER_USER:root'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'
+    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'