From 2662d4bcd1539b9b115d149c363a6d7fa9482cf6 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 24 Jan 2018 14:28:29 -0500 Subject: [PATCH] Switch the csit-3node 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-3node 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: I557e2030280fd3538d3a83fd1833b173cc45f489 Signed-off-by: Thanh Ha --- jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml | 2 +- jjb/controller/controller-csit-clustering.yaml | 2 +- jjb/controller/controller-csit-cs-chasing-leader.yaml | 2 +- jjb/controller/controller-csit-cs-partnheal.yaml | 2 +- jjb/controller/controller-csit-ddb-expl-lead-movement.yaml | 2 +- jjb/controller/controller-csit-drb-partnheal.yaml | 2 +- jjb/controller/controller-csit-drb-precedence.yaml | 2 +- jjb/controller/controller-csit-rest-clust-cars-perf.yaml | 2 +- jjb/daexim/daexim-csit-clustering-basic.yaml | 2 +- jjb/genius/genius-csit-genius.yaml | 2 +- jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml | 2 +- jjb/integration/integration-templates.yaml | 3 ++- jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml | 2 +- jjb/netconf/netconf-cluster-stress.yaml | 2 +- jjb/netconf/netconf-clustering.yaml | 2 +- .../openflowplugin-csit-clustering-bulkomatic.yaml | 2 +- .../openflowplugin-csit-clustering-perf-bulkomatic.yaml | 2 +- jjb/openflowplugin/openflowplugin-csit-clustering.yaml | 2 +- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 +- jjb/sfc/sfc-csit-rest-basic.yaml | 2 +- jjb/vtn/vtn-csit-3node-manager.yaml | 2 +- 21 files changed, 22 insertions(+), 21 deletions(-) diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index a6ea709fe..3d7a48cba 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgpclustering-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'bgpcep' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 142bb1842..1e46d21c7 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -2,7 +2,7 @@ - project: name: controller-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node - inttest-csit-verify-3node # The project name diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 353fadb48..93735f152 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-cluster-singleton-chasing-the-leader-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 5e1baa3bd..7ff4b538b 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-cluster-singleton-partition-and-heal-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 226d14b99..be7345a97 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index f6e79b740..891294cc8 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-dom-rpc-broker-partition-and-heal-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 798248543..8bd1f5a32 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-dom-rpc-broker-precedence-longevity jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 8eaebd644..efd98b37b 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -2,7 +2,7 @@ - project: name: controller-csit-rest-clust-cars-perf jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'controller' diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index a62726383..d90ccbb85 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -2,7 +2,7 @@ - project: name: daexim-csit-clustering-basic jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'daexim' diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 5e01210a3..a78a19747 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -2,8 +2,8 @@ - project: name: genius-csit-genius jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - inttest-csit-1node + - inttest-csit-3node - inttest-csit-verify-1node - inttest-csit-verify-3node diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index af92ac1f9..90800ffea 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -2,7 +2,7 @@ - project: name: groupbasedpolicy-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 266c7d8a7..892e40ab9 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -560,7 +560,8 @@ - lf-infra-publish - job-template: - name: '{project}-csit-3node-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}' + id: inttest-csit-3node disabled: false project-type: freestyle diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 4328c4918..d00618879 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -2,8 +2,8 @@ - project: name: lispflowmapping-csit-msmr jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - inttest-csit-1node + - inttest-csit-3node - inttest-csit-verify-1node # The project name diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 65ab143da..b4a1caa77 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-cluster-stress jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'netconf' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 51c272d14..8131b7613 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'netconf' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 4b09a8a0d..387126dc3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-clustering-bulkomatic jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 3c8aa0353..a6bd1362b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-clustering-perf-bulkomatic jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'openflowplugin' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index b14b2d07a..ec0df076c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -2,7 +2,7 @@ - project: name: openflowplugin-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name project: 'openflowplugin' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index f98831356..4f4850703 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -2,7 +2,7 @@ - project: name: ovsdb-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node - inttest-csit-verify-3node # The project name project: 'ovsdb' diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 0798c705a..5f15d879b 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -2,7 +2,7 @@ - project: name: sfc-csit-rest-basic jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node # The project name diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 56ab4ddeb..9c3efd140 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -2,7 +2,7 @@ - project: name: vtn-csit-3node-manager jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - inttest-csit-3node - inttest-csit-verify-3node # The project name -- 2.36.6