From 4ef2a863969dc4eda8c16975c8d11f7af0bdd565 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 24 Jan 2018 14:11:12 -0500 Subject: [PATCH] Switch the csit-1node to use job prefix Idea to add a new variable "{prefix}" to job templates. This variable is defined already in defaults.yaml. The prefix should always be blank in production thus producing the same existing job names we are all used to. The prefix can be used locally to add a prefix to job names when pushing jobs to the sandbox. For example a prefix of "abc-" will be added to the front of the job name allowing sandbox testers to be able to push a job to the sandbox with a unique prefix to not overwrite other testers. Additionally add an id inttest-csit-1node to make the job template more easy to maintain. Allows us to refactor the job template name without having to update every single user of the template every time as the id will always be the same. Change-Id: I058dd8604cc1d29cc0feaab587298dc2b563a7cf Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 2 +- jjb/aaa/aaa-csit-keystone.yaml | 2 +- jjb/aaa/aaa-csit-tls.yaml | 2 +- jjb/alto/alto-csit-setup.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml | 2 +- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 2 +- jjb/bier/bier-csit-basic.yaml | 2 +- jjb/capwap/capwap-csit-ac.yaml | 2 +- jjb/centinel/centinel-csit-basic.yaml | 2 +- jjb/controller/controller-csit-akka1.yaml | 2 +- jjb/controller/controller-csit-dnb-noloss.yaml | 2 +- jjb/controller/controller-csit-rest-cars-perf.yaml | 2 +- jjb/daexim/daexim-csit-basic.yaml | 2 +- jjb/didm/didm-csit-discovery.yaml | 2 +- jjb/dluxapps/dluxapps-csit-yangman.yaml | 2 +- jjb/genius/genius-csit-genius.yaml | 2 +- jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml | 2 +- jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml | 2 +- jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml | 2 +- .../distribution/distribution-csit-userfeatures.yaml | 2 +- jjb/integration/integration-templates.yaml | 3 ++- jjb/iotdm/iotdm-csit-basic.yaml | 2 +- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 2 +- jjb/l2switch/l2switch-csit-scalability.yaml | 2 +- jjb/l2switch/l2switch-csit-switch.yaml | 2 +- jjb/lacp/lacp-csit-lacp.yaml | 2 +- jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml | 2 +- jjb/lispflowmapping/lispflowmapping-csit-performance.yaml | 2 +- jjb/messaging4transport/messaging4transport-csit-basic.yaml | 2 +- jjb/natapp/natapp-csit-basic.yaml | 2 +- jjb/nemo/nemo-csit-engine.yaml | 2 +- jjb/netconf/netconf-csit-callhome.yaml | 2 +- jjb/netconf/netconf-userfeatures.yaml | 2 +- jjb/netide/netide-csit-basic.yaml | 2 +- jjb/nic/nic-csit-basic.yaml | 2 +- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 2 +- jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 2 +- jjb/of-config/of-config-csit-basic.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-cbench.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-flow-services.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-longevity.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml | 2 +- .../openflowplugin-csit-perf-stats-collection.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-sanity.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-scale-link.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-scale.yaml | 2 +- jjb/ovsdb/ovsdb-csit-southbound.yaml | 2 +- jjb/p4plugin/p4plugin-csit-basic.yaml | 2 +- jjb/packetcable/packetcable-csit-pcmm.yaml | 2 +- jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml | 2 +- jjb/sxp/sxp-csit-basic.yaml | 2 +- jjb/sxp/sxp-csit-filtering.yaml | 2 +- jjb/sxp/sxp-csit-topology.yaml | 2 +- jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml | 2 +- jjb/tsdr/tsdr-csit-cassandra.yaml | 2 +- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 2 +- jjb/tsdr/tsdr-csit-hbase.yaml | 2 +- jjb/tsdr/tsdr-csit-hsqldb.yaml | 2 +- jjb/unimgr/unimgr-csit-basic.yaml | 2 +- jjb/unimgr/unimgr-csit-legato.yaml | 2 +- jjb/usc/usc-csit-channel.yaml | 2 +- jjb/usc/usc-csit-tcp.yaml | 2 +- jjb/usecplugin/usecplugin-csit-basic.yaml | 2 +- jjb/vtn/vtn-csit-coordinator.yaml | 2 +- jjb/vtn/vtn-csit-manager.yaml | 2 +- 67 files changed, 68 insertions(+), 67 deletions(-) diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index b76745f61a..f4a0125c57 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -2,7 +2,7 @@ - project: name: aaa-csit-authn jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 1e89f7efcb..5f898174fb 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -2,7 +2,7 @@ - project: name: aaa-csit-keystone jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index c9f009f143..7898be6599 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -2,7 +2,7 @@ - project: name: aaa-csit-tls jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'aaa' diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 03d08d4404..172f7506b3 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -2,7 +2,7 @@ - project: name: alto-csit-setup jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'alto' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 6c186784e8..2f5cbf60ba 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-gate-bgp-ingest-mixed jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'bgpcep' diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 8df34f7736..c8566b3bfe 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-gate-throughpcep jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'bgpcep' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 2263196d42..384845689b 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-userfeatures jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index f4b88271cc..94459efaf7 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: bier-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index f2a5fa11b4..6a5975d5da 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -2,7 +2,7 @@ - project: name: capwap-csit-ac jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index f4873fb053..9e5489b6f0 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: centinel-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index f6f3e2af74..32595905dc 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -2,7 +2,7 @@ - project: name: controller-csit-akka1 jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index c251b410c2..62e5e42b6e 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-dom-notification-broker-no-loss-longevity jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index a30f5562cf..9b68e7d05f 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -2,7 +2,7 @@ - project: name: controller-csit-rest-cars-perf jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'controller' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 6da14a22a9..9bcd46fdcd 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: daexim-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'daexim' diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index ca5f62fa5b..93c30b9236 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -2,7 +2,7 @@ - project: name: didm-csit-discovery jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index bbcfccdf80..c1c82c6fea 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -2,7 +2,7 @@ - project: name: dluxapps-csit-yangman jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 30d3683680..acf89cb58a 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -3,7 +3,7 @@ name: genius-csit-genius jobs: - '{project}-csit-3node-{functionality}-{install}-{stream}' - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node - '{project}-csit-verify-3node-{functionality}' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 70a637e85c..73e46e8af9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -2,7 +2,7 @@ - project: name: groupbasedpolicy-csit-3node jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'groupbasedpolicy' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 891ff9a3ab..8e5af5eac9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -2,7 +2,7 @@ - project: name: groupbasedpolicy-csit-6node jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index e722b1a595..9116b0307e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -2,7 +2,7 @@ - project: name: groupbasedpolicy-csit-sxp jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'groupbasedpolicy' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index f9dded57b8..54d9b5ccba 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -2,7 +2,7 @@ - project: name: distribution-csit-userfeatures jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'distribution' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index f96a41b93c..1910b02f42 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -120,7 +120,8 @@ - lf-infra-publish - job-template: - name: '{project}-csit-1node-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' + id: inttest-csit-1node # Keep synchronized with *-csit4-*-carbon please. disabled: false diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index fff52056b9..6c53fd8029 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: iotdm-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 28e7f4faea..5612eab04d 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: jsonrpc-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'jsonrpc' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index f05ac233d9..3c1929909e 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -2,7 +2,7 @@ - project: name: l2switch-csit-scalability jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'l2switch' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 6472498259..8a07d07f7d 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -2,7 +2,7 @@ - project: name: l2switch-csit-switch jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 399f3bfb52..de7b79f6e6 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -2,7 +2,7 @@ - project: name: lacp-csit-lacp jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index ddf6bad635..4328c4918d 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -3,7 +3,7 @@ name: lispflowmapping-csit-msmr jobs: - '{project}-csit-3node-{functionality}-{install}-{stream}' - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index bcacff0e53..1bc80b3ebf 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -2,7 +2,7 @@ - project: name: lispflowmapping-csit-performance jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'lispflowmapping' diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index c10c37054f..d59e37040e 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: messaging4transport-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index 9acd8ba841..da7bfc6bc9 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: natapp-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 397c0fc5d8..f2c8cbd75a 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -2,7 +2,7 @@ - project: name: nemo-csit-engine jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 546f21d02c..8f407370d1 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-callhome jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'netconf' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 99cf9394f6..1fe61a7531 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-userfeatures jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 53629f8d20..9e1756f66d 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -3,7 +3,7 @@ name: netide-csit-basic jobs: - inttest-csit-verify-1node - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'netide' diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 61d28ced6d..828a0caf7b 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: nic-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index afcdd3d273..8cc76c6e8e 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: ocpplugin-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index 427899f210..2287da9f48 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -2,7 +2,7 @@ - project: name: ocpplugin-csit-scalability jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index f126e27b6c..1f2b7dce76 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -3,7 +3,7 @@ name: of-config-csit-basic jobs: - inttest-csit-verify-1node - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'of-config' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index e098a9845e..be9eb62d82 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-cbench jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index ffbfa0fc08..8130af298d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-flow-services jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 4179e50445..e94a8efcc7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-longevity jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 1c913d8444..416592a8d7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-perf-bulkomatic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index b1eb7dada7..006c4406cd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-perf-stats-collection jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 6cd924d0f3..898c7476b9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-sanity jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 8f2ed52f48..2e49e9d08d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-scale-link jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index e25dde647b..f1162b8ccd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-scale-switch jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index dc36c678b3..0e5a7e20fb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-scale jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'openflowplugin' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 1bf4715cfc..29eea50d3e 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -2,7 +2,7 @@ - project: name: ovsdb-csit-southbound jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name project: 'ovsdb' diff --git a/jjb/p4plugin/p4plugin-csit-basic.yaml b/jjb/p4plugin/p4plugin-csit-basic.yaml index a9215e6b2e..e9f6d10c32 100644 --- a/jjb/p4plugin/p4plugin-csit-basic.yaml +++ b/jjb/p4plugin/p4plugin-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: p4plugin-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'p4plugin' diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index bddf9420bf..5d642d1ee3 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -2,7 +2,7 @@ - project: name: packetcable-csit-pcmm jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index dfb2393afa..834ff2b812 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: sdninterfaceapp-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 48fefa8352..5c91055cb9 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'sxp' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 930c1073fb..410c409b6d 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-filtering jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'sxp' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index cd76ffac8e..16e672552d 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-topology jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node # The project name project: 'sxp' diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index dc0d9b36af..5ebd9e0d8b 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -2,7 +2,7 @@ - project: name: topoprocessing-csit-topology-operations jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 03b7f82671..5a712c6656 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -2,7 +2,7 @@ - project: name: tsdr-csit-cassandra jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 7e8adb1206..c67e3101ac 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -2,7 +2,7 @@ - project: name: tsdr-csit-elasticsearch jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 52af004b0b..37840bb3b7 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -2,7 +2,7 @@ - project: name: tsdr-csit-hbase jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 77132b8463..6d4e1cbcd9 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -2,7 +2,7 @@ - project: name: tsdr-csit-hsqldb jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 94ae2f04d6..91835fbbbd 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: unimgr-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index a44fc030de..b575e274f7 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -2,7 +2,7 @@ - project: name: unimgr-csit-legato jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 7fcd1f8983..1e85d7bd50 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -2,7 +2,7 @@ - project: name: usc-csit-channel jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 275ae8b71d..0c409bc802 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -2,7 +2,7 @@ - project: name: usc-csit-tcp jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 5acb844e8e..3804149255 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -2,7 +2,7 @@ - project: name: usecplugin-csit-basic jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index b5ec468ef8..92bdeab82d 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -2,7 +2,7 @@ - project: name: vtn-csit-vtn-coordinator jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 9bd1277e18..e9efdf10f6 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -2,7 +2,7 @@ - project: name: vtn-csit-manager jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - inttest-csit-1node - inttest-csit-verify-1node # The project name -- 2.36.6