Merge "Build AR Magnesium with openjdk11"

[releng/builder.git] / jjb / genius / genius-csit-genius.yaml

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index c46ed7ed0aca412423aa41acec79cf348a751600..ceb1a1a139c9da9d23c2fcea861bd766d12344d7 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -2,8 +2,8 @@
 - project:
     name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
     project: 'genius'
 
@@ -13,50 +13,26 @@
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
 
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    tools_system_count: 3
-
-    install-features: 'odl-genius-rest'
-
-
-- project:
-    name: genius-csit-genius-carbon-nitrogen
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
-
-    project: 'genius'
-
-    functionality:
-      - 'upstream'
-      - 'gate'
+    testplan: '{project}-{functionality}.txt'
 
     stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    testplan: 'genius-carbon-nitrogen.txt'
+      - magnesium:
+          branch: 'master'
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     tools_system_count: 3
 
     install-features: 'odl-genius-rest'
-
+    robot-options: '-v FAIL_ON_EXCEPTIONS:False'
 
 - project:
     name: genius-csit-genius-verify
@@ -72,13 +48,13 @@
       - fluorine:
           branch: 'master'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
+    verify-stream: 'neon'
+    verify-branch: 'stable/neon'
     verify-karaf-version: 'karaf4'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     tools_system_count: 3