Rename arm-pod3-2 to arm-pod4

Arm-pod3-2 is a second jenkins slave for arm-pod3.
This slave is arm while the old jenkins slave is x86.
Fatih requested for this slave to be renamed to arm-pod4
instead of arm-pod3-2, even if it's a slave for an existing pod

JIRA: ARMBAND-252

Change-Id: I5645edd7d774f763e5e72115851c7061bfafd344
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index ff855c1..17d5204 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -56,8 +56,8 @@
             slave-label: arm-pod3
             installer: fuel
             <<: *danube
-        - arm-pod3-2:
-            slave-label: arm-pod3-2
+        - arm-pod4:
+            slave-label: arm-pod4
             installer: fuel
             <<: *danube
         - arm-virtual1:
@@ -75,8 +75,8 @@
             slave-label: arm-pod3
             installer: fuel
             <<: *master
-        - arm-pod3-2:
-            slave-label: arm-pod3-2
+        - arm-pod4:
+            slave-label: arm-pod4
             installer: fuel
             <<: *master
         - arm-virtual1:
@@ -590,61 +590,61 @@
 # Enea Armband POD 3 Triggers running against master branch (aarch64 slave)
 #--------------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-2-master-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-arm-pod4-master-trigger'
     triggers:
         - timed: ''
 #--------------------------------------------------------------------------
 # Enea Armband POD 3 Triggers running against danube branch (aarch64 slave)
 #--------------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-2-danube-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-arm-pod4-danube-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index 2e5aa39..e445e08 100755 (executable)
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -33,10 +33,10 @@ fi
 # set deployment parameters
 export TMPDIR=${WORKSPACE}/tmpdir
 
-# arm-pod3-2 is an aarch64 jenkins slave for the same POD as the
+# arm-pod4 is an aarch64 jenkins slave for the same POD as the
 # x86 jenkins slave arm-pod3; therefore we use the same pod name
 # to deploy the pod from both jenkins slaves
-if [[ "${NODE_NAME}" == "arm-pod3-2" ]]; then
+if [[ "${NODE_NAME}" == "arm-pod4" ]]; then
     NODE_NAME="arm-pod3"
 fi
 

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 80ca44b..9e2cdd4 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -158,7 +158,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod3-2:
+        - arm-pod4:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -194,7 +194,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
-        - arm-pod3-2:
+        - arm-pod4:
             slave-label: '{pod}'
             installer: fuel
             <<: *danube

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index fc89f14..fad06b0 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -747,15 +747,15 @@
             default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
             description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'arm-pod3-2-defaults'
+    name: 'arm-pod4-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-pod3-2
+                - arm-pod4
             default-slaves:
-                - arm-pod3-2
+                - arm-pod4
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT