From bf147f90fdda97f134d54b4297ac08d31f66e4c8 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 24 Jan 2018 14:34:40 -0500 Subject: [PATCH] Switch the csit-hwvtep-openstack 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-hwvtep-openstack 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: I86685a09eb2a3b385778c4dfc7a59b45e97d1693 Signed-off-by: Thanh Ha --- jjb/integration/integration-templates.yaml | 3 ++- jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index f96a41b93..3f7ae25ad 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1010,7 +1010,8 @@ - lf-infra-publish - job-template: - name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + id: inttest-csit-hwvtep-openstack disabled: false project-type: freestyle diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 8e3a4ac18..9793e3b2d 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -2,7 +2,7 @@ - project: name: netvirt-csit-hwvtep-openstack-integration-oxygen jobs: - - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + - inttest-csit-hwvtep-openstack project: 'netvirt' stream: 'oxygen' @@ -62,7 +62,7 @@ - project: name: netvirt-csit-hwvtep-openstack-integration-nitrogen jobs: - - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + - inttest-csit-hwvtep-openstack project: 'netvirt' stream: 'nitrogen' @@ -124,7 +124,7 @@ - project: name: netvirt-csit-hwvtep-openstack-integration-carbon jobs: - - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + - inttest-csit-hwvtep-openstack project: 'netvirt' -- 2.36.6