Merge "Update cloud image list docs"

[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 77d08b0d780fd61331505cb8d219410daf6242b9..f4df8dc32b27258bc4550f4a0a03f810e99d1f44 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,79 +1,38 @@
 ---
 - project:
-    name: genius-csit-genius-oxygen
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
-    # The project name
-    project: 'genius'
+    project: "genius"
 
-    # The functionality under test
     functionality:
-      - 'upstream'
-      - 'gate'
-      - 'tdd-wip':
-          testplan: '{project}-tdd-wip.txt'
-          schedule: ''
+      - "upstream"
+      - "gate"
+      - "tdd-wip":
+          testplan: "{project}-tdd-wip.txt"
 
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-    install:
-      - all:
-          scope: 'all'
-
-    # Mininet configuration
-    tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
-    # Features to install
-    install-features: 'odl-genius-rest'
-
-    # Robot custom options
-    robot-options: ' '
-
-- project:
-    name: genius-csit-genius-{stream}
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
+    testplan: "{project}-{functionality}.txt"
 
-    # The project name
-    project: 'genius'
-
-    # The functionality under test
-    functionality:
-      - 'upstream'
-      - 'gate'
-
-    # Project branches
     stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
-    verify-karaf-version: 'karaf4'
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+      - sodium:
+          branch: "stable/sodium"
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: "only"
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
-    # Features to install
-    install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
+    install-features: "odl-genius-rest"
+    robot-options: "-v FAIL_ON_EXCEPTIONS:False"