summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-05 22:13:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-05 22:13:21 +0000
commitdc34383d611547e1488c4162b0f58a18026664a6 (patch)
tree21e676861ab0337339529796915963a80e065f18
parentd2ad4edc74476207dc7954d5a6406eb76540bfdb (diff)
parentf01fcfb1756a7a046db20a1ca4c68f488ac8e83c (diff)
Merge "Rename Juniper Jenkins Slave"
-rw-r--r--jjb/joid/joid-deploy.sh2
-rw-r--r--jjb/opnfv/slave-params.yml4
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml2
3 files changed, 3 insertions, 5 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 59ba01588..149447733 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -50,8 +50,6 @@ fi
case $NODE_NAME in
orange-fr-pod2)
POD=orange-pod2 ;;
- juniper-us-test-1)
- POD=juniper-pod1 ;;
*virtual*)
POD=default ;;
*)
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 2ca4459dd..930f599ec 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -415,9 +415,9 @@
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - juniper-us-test-1
+ - juniper-pod1
default-slaves:
- - juniper-us-test-1
+ - juniper-pod1
- string:
name: INSTALLER_VERSION
default: latest
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 8dd0a4af0..d77e50e30 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -181,7 +181,7 @@
- timed: '0 3 * * *'
#- trigger:
-# name: 'qtip-daily-juniper-build1-trigger'
+# name: 'qtip-daily-juniper-pod1-trigger'
# triggers:
# - timed : '0 0 * * *'