delete the 'node' parameter in 'doctor-slave-parameter' macro

[releng.git] / jjb / global / slave-params.yml

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 6171a6a..ee63578 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -19,6 +19,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-baremetal-fraser-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-baremetal-master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-baremetal-euphrates-defaults'
     parameters:
@@ -65,6 +80,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-virtual-fraser-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-virtual-euphrates-defaults'
     parameters:
@@ -975,18 +1005,6 @@
 - parameter:
     name: 'doctor-slave-parameter'
     parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - 'doctor-apex-x86_64'
-            - 'doctor-fuel-x86_64'
-            - 'doctor-fuel-aarch64'
-            - 'doctor-joid-x86_64'
-            - 'doctor-daisy-x86_64'
-            - 'not-specified'
-          default-slaves:
-            - 'not-specified'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT