Rename Orange Jenkins Slaves

orange-test1   -> orange-pod5
orange-fr-pod2 -> orange-pod2

Change-Id: Id5a31db98d349bef654fb59ab03e52e6cc50611f
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2a788f6..6cfcfdc 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -76,7 +76,7 @@
         - ericsson-pod1:
             installer: fuel
             <<: *master
-        - orange-test1:
+        - orange-pod5:
             installer: fuel
             <<: *master
         - orange-pod2:

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 1494477..6b6cc9b 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -48,8 +48,6 @@ fi
 ##
     # This part will be removed when pod names will be synced between jenkins and joid config
     case $NODE_NAME in
-        orange-fr-pod2)
-            POD=orange-pod2 ;;
         *virtual*)
             POD=default ;;
         *)

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index c45ac7b..92d59b7 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -438,9 +438,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-fr-pod2
+                - orange-pod2
             default-slaves:
-                - orange-fr-pod2
+                - orange-pod2
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -459,15 +459,15 @@
             description: "External network to create (name;type;first ip;last ip; gateway;network)"
 
 - parameter:
-    name: 'orange-test1-defaults'
+    name: 'orange-pod5-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-test1
+                - orange-pod5
             default-slaves:
-                - orange-test1
+                - orange-pod5
         - string:
             name: INSTALLER_VERSION
             default: latest

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 5d4eeac..39d856e 100644 (file)
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -176,7 +176,7 @@
 #        - timed : '0 0 * * *'
 
 #- trigger:
-#   name: 'qtip-dailty-orange-fr-pod2-trigger'
+#   name: 'qtip-dailty-orange-pod2-trigger'
 #   triggers:
 #       - timed : ' 0 0 * * *'