From: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
Date: Tue, 10 May 2016 16:48:12 +0000 (-0400)
Subject: Rename ZTE Jenkins Slaves
X-Git-Tag: colorado.1.0~511
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b8674403985119f8dc4d1548acbe7233f2cb372d;p=releng.git

Rename ZTE Jenkins Slaves

Change-Id: I0e2722ce81d1ffca966832f608b51f8624866ce1
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
---

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 8745aec5b..1109d188e 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -57,7 +57,7 @@
         - intel-pod8:
             installer: compass
             <<: *master
-        - zte-build-1:
+        - zte-pod1:
             installer: fuel
             <<: *master
         - orange-pod2:
@@ -250,7 +250,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-zte-build-1'
+    name: 'bottlenecks-params-zte-pod1'
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index f9f53ec7c..c45ac7b2d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -394,15 +394,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'zte-build-1-defaults'
+    name: 'zte-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - zte-build-1
+                - zte-pod1
             default-slaves:
-                - zte-build-1
+                - zte-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 44bdd7138..5d4eeac8b 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -38,7 +38,7 @@
             installer: joid
             <<: *master
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-#      - zte-build-1:   #would be confirmed with the ZTE lab by tomorrow
+#      - zte-pod1:   #would be confirmed with the ZTE lab by tomorrow
 #            installer: fuel
 #            <<: *master
 
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 57aa29c54..82b1a2367 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -108,10 +108,10 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - zte-build-1:
+        - zte-pod1:
             installer: fuel
             suite: daily
-            auto-trigger-name: 'yardstick-daily-zte-build-1-trigger'
+            auto-trigger-name: 'yardstick-daily-zte-pod1-trigger'
             <<: *master
         - orange-pod2:
             installer: joid
@@ -387,7 +387,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-zte-build-1'
+    name: 'yardstick-params-zte-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -439,7 +439,7 @@
 #######################
 # trigger for PODs to only run yardstick test suites
 - trigger:
-    name: 'yardstick-daily-zte-build-1-trigger'
+    name: 'yardstick-daily-zte-pod1-trigger'
     triggers:
         - timed: '0 2 * * *'
 
@@ -456,4 +456,4 @@
 - trigger:
     name: 'yardstick-daily-huawei-sh-pod6-trigger'
     triggers:
-        - timed: '0 1 * * *'
\ No newline at end of file
+        - timed: '0 1 * * *'