Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Change the path of images from pre_config/ to images/"
[releng.git]
/
jjb
/
global
/
slave-params.yml
diff --git
a/jjb/global/slave-params.yml
b/jjb/global/slave-params.yml
index
4902dcf
..
6171a6a
100644
(file)
--- 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'
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'
- 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'
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'
- 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'
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'
- parameter:
name: 'apex-virtual-master-defaults'
@@
-84,15
+64,6
@@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
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-euphrates-defaults'
- parameter:
name: 'apex-virtual-euphrates-defaults'
@@
-108,15
+79,6
@@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
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'
- parameter:
name: 'apex-virtual-danube-defaults'
@@
-132,13
+94,6
@@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
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'
- parameter:
name: 'lf-pod1-defaults'
@@
-1028,6
+983,7
@@
- 'doctor-fuel-x86_64'
- 'doctor-fuel-aarch64'
- 'doctor-joid-x86_64'
- 'doctor-fuel-x86_64'
- 'doctor-fuel-aarch64'
- 'doctor-joid-x86_64'
+ - 'doctor-daisy-x86_64'
- 'not-specified'
default-slaves:
- 'not-specified'
- 'not-specified'
default-slaves:
- 'not-specified'