Merge "Add gre type driver for dc-gw and tdd cases"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index a8187efaf331e7597684bdf782a5af7783bee0a3..53be57d709e506a072b0e5e1d5467546c9793508 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,8 +2,8 @@
 - 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'
@@ -15,19 +15,18 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 16.04 - gbp - 20171212-0322
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: >