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/global/slave-params.yml | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'jjb/global/slave-params.yml') diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 16de0bced..86b369bcd 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -18,13 +18,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - parameter: name: 'apex-baremetal-euphrates-defaults' @@ -40,13 +33,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - parameter: name: 'apex-baremetal-danube-defaults' @@ -62,13 +48,7 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 + - parameter: name: 'apex-virtual-master-defaults' @@ -99,15 +79,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-virtual2 - - lf-virtual3 - default-slaves: - - lf-virtual2 - - lf-virtual3 - parameter: name: 'apex-virtual-danube-defaults' @@ -123,13 +94,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod3 - default-slaves: - - lf-pod3 - parameter: name: 'lf-pod1-defaults' -- cgit 1.2.3-korg