X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=5b94607e57e4ccf65e10e9f3c619f95a625ed30c;hb=c9823f7d84fcb16d4ca137bcb34b5b81f743d9df;hp=2018dd582da2a4bd4343e98526bd70eb69d1ae54;hpb=d69386cb64206b75ccc164537e4d5ae636a6cd52;p=releng.git

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 2018dd582..5b94607e5 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -140,21 +140,6 @@
           default-slaves:
             - lf-pod3
 
-- parameter:
-    name: 'arm-pod5-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - arm-pod5
-          default-slaves:
-            - arm-pod5
-      - string:
-          name: BRIDGE
-          default: 'admin7_br0,mgmt7_br0,,public7_br0'
-          description: 'Pre-existing bridges used by Fuel'
-
 - parameter:
     name: 'lf-pod1-defaults'
     parameters:
@@ -174,21 +159,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
-- parameter:
-    name: 'lf-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod2
-          default-slaves:
-            - lf-pod2
-      - string:
-          name: BRIDGE
-          default: 'pxebr,br-ctl'
-          description: 'Pre-existing bridges used by Fuel'
-
 - parameter:
     name: 'lf-pod3-defaults'
     parameters:
@@ -520,25 +490,6 @@
 #####################################################
 # Parameters for none-CI PODs
 #####################################################
-- parameter:
-    name: 'ericsson-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - ericsson-pod1
-          default-slaves:
-            - ericsson-pod1
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.1.2'
-          description: 'IP of the installer'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'cengn-pod1-defaults'
     parameters:
@@ -765,7 +716,7 @@
       - string:
           name: BRIDGE
           default: 'br7'
-          description: 'pxe bridge for booting of Fuel master'
+          description: 'pxe bridge for booting of Daisy master'
 
 - parameter:
     name: 'zte-pod3-defaults'
@@ -781,10 +732,14 @@
           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'
       - string:
           name: BRIDGE
           default: 'br0'
-          description: 'pxe bridge for booting of Fuel master'
+          description: 'pxe bridge for booting of Daisy master'
 
 - parameter:
     name: zte-pod4-defaults
@@ -914,21 +869,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
-- parameter:
-    name: 'arm-virtual2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - arm-virtual2
-          default-slaves:
-            - arm-virtual2
-      - string:
-          name: BRIDGE
-          default: ',,,public8_br0'
-          description: 'Pre-existing bridges used by Fuel'
-
 - parameter:
     name: 'intel-virtual6-defaults'
     parameters: