From 6db8417d12d51bfd4a934b4c4c48afe72aad32db Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 24 Jan 2018 14:30:13 -0500
Subject: [PATCH] Switch the csit-3node-periodic 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-periodic 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: I732dd5120b2005c5e975f68f7d99a98c1203ebe5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml                   | 2 +-
 jjb/bgpcep/bgpcep-csit-bgpclustering.yaml                      | 2 +-
 .../controller-csit-periodic-dsbenchmark-cluster.yaml          | 2 +-
 jjb/integration/integration-templates.yaml                     | 3 ++-
 jjb/netconf/netconf-clustering-scale.yaml                      | 2 +-
 jjb/sxp/sxp-csit-cluster-routing.yaml                          | 2 +-
 jjb/sxp/sxp-csit-clustering.yaml                               | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 2ba4c45ca..3f5f7270f 100644
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index d3ff23c59..43a1ef188 100644
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index eba3e2258..f308a1632 100644
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark-cluster
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'controller'
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 892e40ab9..0c412626a 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -788,7 +788,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-periodic
     disabled: false
 
     project-type: freestyle
diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index de4492d77..1b0645bbb 100644
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering-scale
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'netconf'
diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 944900908..9474a4097 100644
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 9357903a1..0b5e3adac 100644
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-clustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
-- 
2.36.6