Merge "Do not trigger distribution-merge by controller"

[releng/builder.git] / jjb / dluxapps / dluxapps-csit-yangman.yaml

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index a6dcaaea9ff381f29c4ada354f233bf7dca0f902..e4e898f7e31057c92f1bcde9d27915a0ca864ab2 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -2,31 +2,26 @@
 - project:
     name: dluxapps-csit-yangman
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'dluxapps'
+    disable-job: true
 
     # The functionality under test
     functionality: 'yangman'
 
     # Project branches
     stream:
-      - oxygen:
+      - aluminium:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    # dluxapps started in Carbon project, so current verify with Boron is not working
-    verify-stream: 'carbon'
-    verify-branch: 'stable/carbon'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - all: