Merge "Add VLAN private network support to devstack"

[releng/builder.git] / jjb / yangtools / yangtools-csit-system.yaml

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 2de2718052078c52d2baf1548d591d88aa5e58f4..313ba85c9bfd7535406fd8e3f8287169e26979e9 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -9,25 +9,20 @@
     # The functionality under test
     functionality: 'system'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
+    # Project branches.
     stream:
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+        # The tested component was only introduced in Carbon.
 
     install:
         - only:
             scope: 'only'
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
-    mininet-vms: 0
-    controller-image: 'centos7-java-builder-4c-8g'
+    tools_system_count: 0
+    odl_system_flavor: 8 GB General Purpose v1
 
     # Features to install
     install-features: 'odl-restconf'