Magnesium branch cut

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

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index fa5d9de21ce5902d71d1fee7081a978ce7f90cab..35c33656abc21ebfa566db6811e558adfec42271 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -2,7 +2,7 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'distribution'
@@ -12,13 +12,16 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - aluminium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
 
     install:
       - all:
@@ -29,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1