Merge "Update Ansible playbooks to new names"

[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 d137efcbbb77d28eb069c4fc8508f64a7c335f48..a78a197476880a80160c9ad4f7ccd01458898c16 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,39 +1,41 @@
+---
 - project:
     name: genius-csit-genius
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
+
 
     # The project name
     project: 'genius'
 
     # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Mininet configuration
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
-    mininet-vms: 2
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Features to install
-    install-features: 'odl-genius-ui'
+    install-features: 'odl-genius-rest'
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'