From 51f6abcb199ba2616211b852e74b252c038b6d7a Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 24 Jan 2018 14:20:03 -0500 Subject: [PATCH] Switch the csit-1node-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-1node-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: I462a6bf817fa0922cc62bb39062e516ba14521ac Signed-off-by: Thanh Ha --- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 +- jjb/controller/controller-csit-periodic-dsbenchmark.yaml | 2 +- jjb/integration/integration-templates.yaml | 3 ++- jjb/l2switch/l2switch-csit-host-scalability-daily.yaml | 2 +- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 +- jjb/netconf/netconf-scale.yaml | 2 +- jjb/sxp/sxp-csit-performance.yaml | 2 +- jjb/yangtools/yangtools-csit-system.yaml | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 92a150ae99..dc8bd41a11 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgp-ingest-mixed jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality. # The project name diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index a7e10c9a70..f835ad7577 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgp-ingest jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition. # The project name diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index eca4d8bbea..5ea5cc3dcd 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-throughpcep jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality. # The project name diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index bc7901bb24..65c593e3f7 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-periodic-dsbenchmark jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'controller' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 1910b02f42..0ea3eaa645 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -241,7 +241,8 @@ - lf-infra-publish - job-template: - name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + id: inttest-csit-1node-periodic disabled: false project-type: freestyle diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index f590140751..6ef4b908c9 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -2,7 +2,7 @@ - project: name: l2switch-csit-host-scalability-daily jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'l2switch' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 0d130e14f4..9cfbaaff2b 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-bindingv1 jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'mdsal' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index a0dee25978..e18b10083b 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-scale jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'netconf' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 50fc054c59..7b909d0ef8 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-performance jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'sxp' diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 333bae4a1a..c2d51a1c77 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -2,7 +2,7 @@ - project: name: yangtools-csit-system jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - inttest-csit-1node-periodic # The project name project: 'yangtools' -- 2.36.6