summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-04 13:28:30 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-12 10:17:44 +0200
commitb8b022052d98591f128f8d7a2616513b6880ce39 (patch)
tree95549ab13ed8c64e3cdf626da6a1d3fc6ee8b6a2 /jjb
parent65ec784f20e532caf34f5391684caa0e86742c4d (diff)
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>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-ci-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh2
-rw-r--r--jjb/opnfv/slave-params.yml10
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml2
4 files changed, 7 insertions, 9 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2a788f6ec..6cfcfdca4 100644
--- 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 149447733..6b6cc9bbc 100644
--- 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 c45ac7b2d..92d59b724 100644
--- 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 5d4eeac8b..39d856ea7 100644
--- 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 * * *'