From 7c477342e1a015d69b6e510ef27cea05f3d110f9 Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Fri, 2 Feb 2018 20:18:27 +0530 Subject: [PATCH 1/1] Fix genius CSIT jobs 1. Run tdd-wip only on oxygen 2. Split nitrogen+carbon to separate jobs 3. Use nitrogen/carbon for verify Change-Id: Id8950408fef50444d35d10e43b0714217d3c3dbd Signed-off-by: Vishal Thapar --- jjb/genius/genius-csit-genius.yaml | 38 ++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index fea7ca0358..1d64f2e5d8 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -1,12 +1,9 @@ --- - project: - name: genius-csit-genius + name: genius-csit-genius-oxygen jobs: - inttest-csit-1node - inttest-csit-3node - - inttest-csit-verify-1node - - inttest-csit-verify-3node - # The project name project: 'genius' @@ -23,6 +20,39 @@ stream: - oxygen: branch: 'master' + 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 + + + # The project name + project: 'genius' + + # The functionality under test + functionality: + - 'upstream' + - 'gate' + + # Project branches + stream: - nitrogen: branch: 'stable/nitrogen' - carbon: -- 2.36.6