Merge "Update cloud image Ubuntu18.04 helm x86_64"

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-userfeatures.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 7d4c346eaa1f7f3fe7d3debdbeddfee38f6d79a2..9d7ba8d5fd41308c13bda53783401aa5d9ab2c5d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -1,48 +1,47 @@
+---
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'bgpcep'
+    project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - argon:
+          branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+
+    karaf-version: bgpcep
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: "all"
 
     # Features to install
-    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
-    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
+    install-features: >
+      odl-restconf,
+      odl-bgpcep-pcep,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example,
+      odl-bgpcep-bmp,
+      odl-bgpcep-bmp-config-example,
+      odl-jolokia,
+      odl-restconf-nb-bierman02
 
     # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    # Netconf is there for run-time re-configuration.
-    # AAA could also be a dependency, but probability of breakage is too low to trigger everytime.
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        mdsal-distribution-{stream},
-        netconf-distribution-{stream},
-        tcpmd5-distribution-{stream},
-        bgpcep-distribution-{stream}
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"