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 <vthapar@redhat.com>

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 435bbf8cf825f19a1defbbd6fff288c3d117f415..06f0b3224df15dd51f7c1d47612e15c92775a53e 100644 (file)
--- 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 3eadc236e1ed442057513db60e20f03d69d1b46b..a0890e13056d2ec6fe9a62a63611ebca40fbcc39 100644 (file)
--- 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 416058edc6794fde7096a0d8ff69117e58ce4deb..3986e83cc3720ed5767ec180629320bb263c2159 100644 (file)
--- 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 6b400ad862fa02627d640256ecbc44f3242eb293..77067e5cb78b551cdb949ffa7448bca760d84fa1 100644 (file)
--- 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 0ad48be4ec91671d9478547688a3ead3cf300fe7..9b7a01ac030a6010a93fa5b214659d676d01ae57 100644 (file)
--- 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 a714bfbba3a9eccc47b5f0a27d96a03abbe8dbdc..f81028f5db850c9bd02061061f923cc0c7c1dc77 100644 (file)
--- 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 57be9966ae629e4bd4e9da811d0a362afb12ea4b..67fd3eca790c6daedfb7f96d923937df868a94e9 100644 (file)
--- 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 c6985d86aeaa0784c31e700a10cbd136383df0e0..be4b4d8b4e8b4f9d6141a315750bdc425cbdae79 100644 (file)
--- 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 80327f4a8ec1eb7fec56573c8609da43e345faeb..43fa3a267b97b23369038d120615bb979df1bf23 100644 (file)
--- 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 978010b2d5c7661d9ef212d598c1ddb94804c0a6..ffafa87c310ffd9849f5f0b0b1957fe15104a832 100644 (file)
--- 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 97cd96f917f94eaf9c8acd1de5bf05a15e45aeb5..8c2119f2cfbe74838d03dabb3bfb9f8a87b1e505 100644 (file)
--- 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 1e33070960e46d1572dbdb3133d73241b456fb99..2453f98128c214316d655b39720352f4f711c735 100644 (file)
--- 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 91a38b492ea8181fa0e4de4a9f9625c102b247ae..1ba9d383be03469e4b91533625200f4552f59f2e 100644 (file)
--- 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 1a3be635fc08adda93830054be440e1edccf9274..bcfd5647e3a9c417485658667ad1553c84e215a3 100644 (file)
--- 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 247e9e9e65859239edabd35490f4055ab774d1c6..560e8b127b4ff5ddec1282d609fe4e72efa64094 100644 (file)
--- 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 8de079d4f415bc8fae8dc11b0f61511be56a3451..da018f3a1bd522538555cb6abe29ec1328c8af1c 100644 (file)
--- 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 9e1167c0d18d211dd35a9ae912fde394413bf951..e414787cd7c75c085865695cfe83be585b640e31 100644 (file)
--- 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}