From 4e35731bfdd968531a7fb78cb1dbe93087f85e64 Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Mon, 5 Nov 2018 08:51:57 +0530 Subject: [PATCH] Use scope -only for genius csit Genius CSIT often runs into failures with bringup issues in -all jobs coz of incompatible versions, models in use by other projects in -all. Replace -all with -only for all Genius CSIT. Change-Id: Id1f6ac4211075cd817ab65f7ab473d6358f8d11d Signed-off-by: Vishal Thapar --- jjb/aaa/aaa-patch-test.yaml | 2 +- jjb/controller/controller-patch-test.yaml | 2 +- jjb/genius/genius-csit-genius.yaml | 8 ++++---- jjb/genius/genius-patch-test.yaml | 6 +++--- jjb/infrautils/infrautils-patch-test.yaml | 2 +- jjb/integration/csit-jobs-fluorine.lst | 4 ++-- jjb/integration/csit-jobs-neon.lst | 4 ++-- jjb/integration/csit-jobs-oxygen.lst | 4 ++-- jjb/integration/integration-test-jobs.yaml | 8 ++++---- jjb/mdsal/mdsal-patch-test.yaml | 2 +- jjb/netconf/netconf-patch-test.yaml | 2 +- jjb/neutron/neutron-patch-test.yaml | 2 +- jjb/odlparent/odlparent-patch-test.yaml | 2 +- jjb/openflowplugin/openflowplugin-patch-test.yaml | 2 +- jjb/ovsdb/ovsdb-patch-test.yaml | 2 +- jjb/serviceutils/serviceutils-patch-test.yaml | 2 +- jjb/yangtools/yangtools-patch-test.yaml | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 435bbf8cf..06f0b3224 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -36,4 +36,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 3eadc236e..a0890e130 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 416058edc..3986e83cc 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -22,8 +22,8 @@ branch: 'stable/oxygen' install: - - all: - scope: 'all' + - only: + scope: 'only' tools_system_count: 3 @@ -49,8 +49,8 @@ verify-karaf-version: 'karaf4' install: - - all: - scope: 'all' + - only: + scope: 'only' tools_system_count: 3 diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 6b400ad86..77067e5cb 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -34,12 +34,12 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} - cluster: csit-list: > - genius-csit-3node-gate-all-{stream} + genius-csit-3node-gate-only-{stream} - tdd-wip: csit-list: > - genius-csit-1node-tdd-wip-all-{stream} + genius-csit-1node-tdd-wip-only-{stream} diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 0ad48be4e..9b7a01ac0 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst index a714bfbba..f81028f5d 100644 --- a/jjb/integration/csit-jobs-fluorine.lst +++ b/jjb/integration/csit-jobs-fluorine.lst @@ -19,8 +19,8 @@ daexim-csit-1node-basic-only-fluorine, daexim-csit-3node-clustering-basic-only-fluorine, distribution-csit-1node-userfeatures-all-fluorine, distribution-csit-managed-fluorine, -genius-csit-1node-upstream-all-fluorine, -genius-csit-3node-upstream-all-fluorine, +genius-csit-1node-upstream-only-fluorine, +genius-csit-3node-upstream-only-fluorine, lispflowmapping-csit-1node-msmr-all-fluorine, lispflowmapping-csit-1node-performance-only-fluorine, lispflowmapping-csit-3node-msmr-all-fluorine, diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst index 57be9966a..67fd3eca7 100644 --- a/jjb/integration/csit-jobs-neon.lst +++ b/jjb/integration/csit-jobs-neon.lst @@ -19,8 +19,8 @@ daexim-csit-1node-basic-only-neon, daexim-csit-3node-clustering-basic-only-neon, distribution-csit-1node-userfeatures-all-neon, distribution-csit-managed-neon, -genius-csit-1node-upstream-all-neon, -genius-csit-3node-upstream-all-neon, +genius-csit-1node-upstream-only-neon, +genius-csit-3node-upstream-only-neon, lispflowmapping-csit-1node-msmr-all-neon, lispflowmapping-csit-1node-performance-only-neon, lispflowmapping-csit-3node-msmr-all-neon, diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst index c6985d86a..be4b4d8b4 100644 --- a/jjb/integration/csit-jobs-oxygen.lst +++ b/jjb/integration/csit-jobs-oxygen.lst @@ -22,8 +22,8 @@ daexim-csit-3node-clustering-basic-only-oxygen, distribution-csit-1node-userfeatures-all-oxygen, distribution-csit-managed-oxygen, dluxapps-csit-1node-yangman-all-oxygen, -genius-csit-1node-upstream-all-oxygen, -genius-csit-3node-upstream-all-oxygen, +genius-csit-1node-upstream-only-oxygen, +genius-csit-3node-upstream-only-oxygen, groupbasedpolicy-csit-1node-3-node-all-oxygen, groupbasedpolicy-csit-1node-6node-all-oxygen, groupbasedpolicy-csit-1node-sxp-only-oxygen, diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 80327f4a8..43fa3a267 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -594,8 +594,8 @@ - daexim-csit-1node-basic-only-fluorine - daexim-csit-3node-clustering-basic-only-fluorine - distribution-csit-1node-userfeatures-all-fluorine - - genius-csit-1node-upstream-all-fluorine - - genius-csit-3node-upstream-all-fluorine + - genius-csit-1node-upstream-only-fluorine + - genius-csit-3node-upstream-only-fluorine - lispflowmapping-csit-1node-msmr-all-fluorine - netconf-csit-1node-callhome-only-fluorine - netconf-csit-1node-userfeatures-all-fluorine @@ -634,8 +634,8 @@ - daexim-csit-1node-basic-only-neon - daexim-csit-3node-clustering-basic-only-neon - distribution-csit-1node-userfeatures-all-neon - - genius-csit-1node-upstream-all-neon - - genius-csit-3node-upstream-all-neon + - genius-csit-1node-upstream-only-neon + - genius-csit-3node-upstream-only-neon - lispflowmapping-csit-1node-msmr-all-neon - netconf-csit-1node-callhome-only-neon - netconf-csit-1node-userfeatures-all-neon diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 978010b2d..ffafa87c3 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 97cd96f91..8c2119f2c 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -33,4 +33,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 1e3307096..2453f9812 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 91a38b492..1ba9d383b 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 1a3be635f..bcfd5647e 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -42,4 +42,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 247e9e9e6..560e8b127 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -23,7 +23,7 @@ feature: - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} - netvirt: csit-list: > netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 8de079d4f..da018f3a1 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 9e1167c0d..e414787cd 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -30,4 +30,4 @@ - genius: csit-list: > - genius-csit-1node-gate-all-{stream} + genius-csit-1node-gate-only-{stream} -- 2.36.6