From: Luis Gomez Date: Fri, 25 Sep 2015 23:59:44 +0000 (-0700) Subject: Change csit verify jobs to use master distribution X-Git-Tag: release/beryllium~496^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=54c2a46becdc7c8fb2995ac1df4c267605b97d0c 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 --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index f9e669913..26368684b 100644 --- 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 2490b7609..b6ac825b1 100644 --- 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 49b2cf013..3ef607559 100644 --- 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 6343fdae8..8b28b72a9 100644 --- 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 52fee0d81..5ee1c4c33 100644 --- 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 54fcb2340..bc1882fe0 100644 --- 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 233961a05..4ad7fd8d0 100644 --- 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 36eb26e40..89021117e 100644 --- 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 fd8326f64..10dfabb44 100644 --- 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 4a8ac50e1..effe58d86 100644 --- 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 0e8a23366..b60d0233c 100644 --- 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 8a4488318..29f0cf0df 100644 --- 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 ef7c04d81..5897adf55 100644 --- 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 43a6de28f..4710056b5 100644 --- 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 5c60f3874..58a5c711e 100644 --- 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 a71b8ebe5..d4b4cc8b2 100644 --- 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 05eac77b4..419c0acc0 100644 --- 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 e45a11306..2763d37b4 100644 --- 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 1aea03903..b1f5f3c19 100644 --- 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 3a76ab273..1bc7c2448 100644 --- 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 72ff78c4c..30f8d7c2a 100644 --- 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 3dee72ff7..bb096260c 100644 --- 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 075532dc3..2d8976239 100644 --- 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 c82a5ee4a..6765767ac 100644 --- 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 ef4175b7e..2d6de949a 100644 --- 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 d0f0dd620..9427eb53b 100644 --- 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'