X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yaml;h=d23171832acbb84c963615853f38e613ce472a39;hb=b0e54cb2dd48d12b3c49db887835de9c75d6bc62;hp=4ff5d679956709ec3826a3de01d6b86aeb005c48;hpb=47d79c9fa51530cc1c46be95bf5a6e70b7c74f1e;p=releng.git

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 4ff5d6799..d23171832 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -21,6 +21,23 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-baremetal-hunter-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - 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-gambia-defaults'
     parameters:
@@ -107,6 +124,23 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-virtual-hunter-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - 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-gambia-defaults'
     parameters:
@@ -270,44 +304,6 @@
           name: SSH_KEY
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
-- parameter:
-    name: 'compass-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'compass-baremetal-master-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'compass-baremetal-branch-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-baremetal-branch'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'fuel-baremetal-defaults'
@@ -409,58 +405,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
-- parameter:
-    name: 'compass-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'compass-arm-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-arm-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'compass-virtual-master-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'compass-virtual-branch-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'compass-virtual-branch'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'fuel-virtual-defaults'
     parameters:
@@ -577,29 +521,11 @@
           description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'pharos-dashboard-defaults'
+    name: 'lf-virtual1-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'pharos-dashboard2'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'opnfv-build-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'opnfv-build'
+          default: 'lf-virtual1'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'
@@ -613,11 +539,11 @@
           description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'lf-build2-defaults'
+    name: 'laas-dashboard-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'lf-build2'
+          default: 'laas-dashboard'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'
@@ -631,25 +557,11 @@
           description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'ericsson-build3-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'ericsson-build3'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-build4-defaults'
+    name: 'opnfv-build-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'ericsson-build4'
+          default: 'opnfv-build'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'
@@ -807,6 +719,25 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'itri-pod1-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - itri-pod1
+          default-slaves:
+            - itri-pod1
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: INSTALLER_IP
+          default: '10.20.0.2'
+          description: 'IP of the installer'
+
 - parameter:
     name: 'huawei-pod3-defaults'
     parameters:
@@ -861,6 +792,21 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
 
+
+- parameter:
+    name: 'intel-pod15-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod15
+          default-slaves:
+            - intel-pod15
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+
 - parameter:
     name: 'intel-pod17-defaults'
     parameters: