From 1786544e04f38eeb5a2046886c712e4b96c2bfbf Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 8 Feb 2018 10:13:11 -0500 Subject: Apex: Cleanup slave/slave-label configuration Changes Include: - Remove defining 'node:' per job template and use slave-params defaults - Gate job was using daily/build slave, when it should be using virtual slave Change-Id: Iec2321801daef1b1fa40724a244bf2f6edf36c6e Signed-off-by: Tim Rozet --- jjb/apex/apex-verify-jobs.yml | 6 ++---- jjb/apex/apex.yml | 6 ------ jjb/apex/apex.yml.j2 | 6 ------ 3 files changed, 2 insertions(+), 16 deletions(-) (limited to 'jjb/apex') diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 111d0c18b..421a3fa31 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -108,8 +108,6 @@ - job-template: name: 'apex-verify-{stream}' - node: 'apex-virtual-master' - concurrent: true disabled: '{obj:disabled}' @@ -117,6 +115,7 @@ project-type: 'multijob' parameters: + - '{project}-virtual-{stream}-defaults' - apex-parameter: gs-pathname: '{gs-pathname}/dev' - project-parameter: @@ -248,8 +247,6 @@ - job-template: name: 'apex-verify-gate-{stream}' - node: 'apex-build-{stream}' - concurrent: true disabled: '{obj:disabled}' @@ -257,6 +254,7 @@ project-type: 'multijob' parameters: + - '{project}-virtual-{stream}-defaults' - apex-parameter: gs-pathname: '{gs-pathname}/dev' - project-parameter: diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 6714d6a66..b07ccd660 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -255,8 +255,6 @@ - job-template: name: 'apex-deploy-{platform}-{stream}' - node: 'apex-{platform}-{stream}' - concurrent: true disabled: false @@ -315,8 +313,6 @@ - job-template: name: 'apex-virtual-{stream}' - node: 'apex-virtual-master' - project-type: 'multijob' disabled: false @@ -581,8 +577,6 @@ # branch: branch (eg. stable) project-type: 'multijob' - node: '{baremetal-slave}' - disabled: '{obj:disable_daily}' scm: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 27a854dd7..b9cbd0240 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -129,8 +129,6 @@ - job-template: name: 'apex-deploy-{platform}-{stream}' - node: 'apex-{platform}-{stream}' - concurrent: true disabled: false @@ -189,8 +187,6 @@ - job-template: name: 'apex-virtual-{stream}' - node: 'apex-virtual-master' - project-type: 'multijob' disabled: false @@ -455,8 +451,6 @@ # branch: branch (eg. stable) project-type: 'multijob' - node: '{baremetal-slave}' - disabled: '{obj:disable_daily}' scm: -- cgit 1.2.3-korg