Refactored job definitions for Netconf testng

The old Netconf testing job was moved into Netconf and
redirected to the new test plan that contains the old test
suite and also the new MDSAL and CRUD suites.

Change-Id: I4dc2c06925403295d6b5608ec84431c141ccd4a0
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/jjb/controller/controller-csit-netconf.yaml b/jjb/netconf/netconf-userfeatures.yaml
similarity index 51%
rename from jjb/controller/controller-csit-netconf.yaml
rename to jjb/netconf/netconf-userfeatures.yaml
index 5ee1c4c33163e184b11a4f86957229fb356afc03..ec87dcf5ce5b1b882e5196d95ed68f64e2dbe36f 100644 (file)
--- a/jjb/controller/controller-csit-netconf.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -1,14 +1,14 @@
 - project:
-    name: controller-csit-netconf
+    name: netconf-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
-    project: 'controller'
+    project: 'netconf'
 
     # The functionality under test
-    functionality: 'netconf'
+    functionality: 'userfeatures'
 
     # Project branches
     stream:
@@ -23,11 +23,15 @@
         - all:
             scope: 'all'
 
+    # Tools system configuration (formerly "mininet configuration")
+    mininet-image: 'rk-c-el6-mininet'
+    mininet-vms: 1
+
     # Features to install
-    install-features: 'odl-netconf-connector-all,odl-restconf-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-netconf-connector-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'