Change csit verify jobs to use master distribution

As per mail discussions we only want to verify test code using master
distribution, this bulk change will consolidate and clean a little bit
the csit verify jobs.

Change-Id: Ie677b1d6abf710f89dbb0e860e13102a28ede233
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index f9e669913643e29d2e1feb026c96b575a561de08..26368684ba266a5540cc055510346b14d2081f21 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -2,7 +2,7 @@
     name: aaa-csit-authn
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'aaa'

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 2490b7609df3ad2225b54f6e6ab37aa30a5214b3..b6ac825b12fe403e3e9eaef165dc0002e4d3cdb2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,7 +2,7 @@
     name: bgpcep-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 49b2cf013c341f470544fd3d9c0c2dd88726aaa3..3ef607559ab083ea8b7a2b5c9d99da792d9d61a7 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -2,7 +2,7 @@
     name: capwap-csit-ac
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'capwap'

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 6343fdae80dea34dd0e5e88072d0fc106f37cac3..8b28b72a984421fbbdf4a123b277674fc1fc5ae0 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,6 +2,7 @@
     name: controller-csit-clustering
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-netconf.yaml b/jjb/controller/controller-csit-netconf.yaml
index 52fee0d81533c317393b004d0254fd26f60c4890..5ee1c4c33163e184b11a4f86957229fb356afc03 100644 (file)
--- a/jjb/controller/controller-csit-netconf.yaml
+++ b/jjb/controller/controller-csit-netconf.yaml
@@ -2,7 +2,7 @@
     name: controller-csit-netconf
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'controller'

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 54fcb234071ec9800c18a7c311636df2fffbf622..bc1882fe02ab386f509d0e20c52beaee851824e1 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -2,7 +2,7 @@
     name: iotdm-csit-basic
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'iotdm'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 233961a05bcd3b3958d80c3ff48968406db231b4..4ad7fd8d0243567b482ec25ded6d0a22b36adc75 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -2,7 +2,6 @@
     name: l2switch-csit-scalability
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 36eb26e400171cd959eb7dd51d86b2773a5e1f41..89021117eaa99c85b59ec27d88df219bf8f32722 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -2,7 +2,7 @@
     name: l2switch-csit-switch
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index fd8326f64a0b1f71a8a8680861d1cd747edd22d3..10dfabb441fb169538f11f0e0bfa27afbc1fbd0e 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -2,7 +2,7 @@
     name: lacp-csit-lacp
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'lacp'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
index 4a8ac50e124eedac4c93c2064bf8b735a6b241fa..effe58d866d216943de90dd4f24032beda03bd4a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
@@ -2,7 +2,6 @@
     name: lispflowmapping-csit-all-stable-lithium
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'lispflowmapping'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 0e8a2336663121a9de26e43d5142baa13e8b2249..b60d0233c1d00b41c21e5e2c9f5868763b507f00 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -2,7 +2,7 @@
     name: lispflowmapping-csit-all
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'lispflowmapping'

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 8a4488318aeec766eb74b3bc8644fa8aa24d1650..29f0cf0dffbfb87edafad9739f20934d6e482d62 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -2,7 +2,7 @@
     name: nic-csit-basic
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'nic'

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index ef7c04d81d8263bde3a6d3f8b9439f91b9360bb8..5897adf55da6a6221ed18f9646b8fbc3c46705e4 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -2,7 +2,7 @@
     name: nic-csit-vtnrenderer
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'nic'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
index 43a6de28f7108fb955a8339466c7189a940a45fb..4710056b59e692116dc66d391123053d698267ba 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
@@ -2,7 +2,7 @@
     name: openflowplugin-csit-flow-services-beryllium
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
index 5c60f3874b8b9bbabdb55511e9721a58b8389e97..58a5c711e82ad6e873c99e0082c6c64b235af4a6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
@@ -2,7 +2,6 @@
     name: openflowplugin-csit-flow-services-lithium
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
index a71b8ebe59afd949005374615c446151e06a2687..d4b4cc8b2bc513c39a3931ff6198abed33a8f1a6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
@@ -2,7 +2,7 @@
     name: openflowplugin-csit-flow-services-more
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 05eac77b47e88ac067f281dd0e9737141a9def55..419c0acc04ca8347a83982ee4f4198420e559943 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -2,7 +2,6 @@
     name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
index e45a11306f9dc769a733a4fc02e3fa8987720100..2763d37b4f41bdbd1a8d9ac0ad9495c5b26e7fac 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml
+++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
@@ -2,7 +2,7 @@
     name: ovsdb-csit-netvirt
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'ovsdb'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 1aea039032bd8f124a96f8522b087fd63f1a9eed..b1f5f3c19ad32b4f8d4429c5c566a72f97981676 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -2,7 +2,7 @@
     name: ovsdb-csit-southbound
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
    # The project name
     project: 'ovsdb'
 

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index 3a76ab273a0899a0a4a9075a27a6adb8c9ea028e..1bc7c24480c9f3d2f230cecd9eed65a2f72aaa6e 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -2,7 +2,7 @@
     name: snmp-csit-basic
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'snmp'

diff --git a/jjb/tsdr/tsdr-csit-h2.yaml b/jjb/tsdr/tsdr-csit-h2.yaml
index 72ff78c4c46b658c769460d731e8e8967feb7611..30f8d7c2a17ab8e19be2c8f15d2f518983f3476f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-h2.yaml
+++ b/jjb/tsdr/tsdr-csit-h2.yaml
@@ -2,7 +2,7 @@
     name: tsdr-csit-h2
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 3dee72ff769424c02a37843a958111d7f19df904..bb096260c5a53864ba300eaca553d9cec1b09737 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -2,7 +2,7 @@
     name: tsdr-csit-hbase
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 075532dc391b66dcb5aa429f9a23075600e07c9c..2d89762396b501b114bc86e697785f3ed20cbbc1 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -2,7 +2,7 @@
     name: usc-csit-channel
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'usc'

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index c82a5ee4a6581ace4afc88cd3a847bd4458419f0..6765767acbbb7b5e1d4136db0b53b7394b64c9db 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -2,7 +2,7 @@
     name: vpnservice-csit-vpnservice
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vpnservice'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index ef4175b7e7d942fe40191b5bca5085894db66490..2d6de949a2d4ca8165038c6a3647c20006b1f494 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -2,7 +2,7 @@
     name: vtn-csit-vtn-coordinator
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vtn'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index d0f0dd620cbd45dc102809cd49298ad8dd33a1f1..9427eb53be2ee38b5dccda651123a390bdb1b4ec 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -2,7 +2,7 @@
     name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vtn'