summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-04 14:01:28 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-04 14:10:50 +0200
commit0480843bcbd89f1c274bffa2b38f78ca842c08b6 (patch)
treebd01e3baeb06fc0758aa6865c55ed76ec6f3ac24
parent510db6f4cb864e02053d86fdff10895fd2455010 (diff)
Rename Dell Jenkins Slaves
Change-Id: Ib1bd98d6e5710d7cb3a7392a2e3987e47cb295f8 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/opnfv/slave-params.yml12
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml16
2 files changed, 9 insertions, 19 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 2ca4459dd..d70cd04d3 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -523,15 +523,15 @@
description: 'SSH key to use for Apex'
- parameter:
- name: 'dell-us-testing-bm-1-defaults'
+ name: 'dell-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - dell-us-testing-bm-1
+ - dell-pod1
default-slaves:
- - dell-us-testing-bm-1
+ - dell-pod1
- string:
name: INSTALLER_VERSION
default: latest
@@ -542,15 +542,15 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'dell-us-deploying-bm3-defaults'
+ name: 'dell-pod2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - dell-us-deploying-bm3
+ - dell-pod2
default-slaves:
- - dell-us-deploying-bm3
+ - dell-pod2
- string:
name: INSTALLER_VERSION
default: latest
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 8dd0a4af0..121a8e4a1 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -23,19 +23,14 @@
# brahmaputra
#--------------------------------
pod:
- - dell-us-testing-bm-1:
+ - dell-pod1:
installer: compass
- auto-trigger-name: 'qtip-daily-dell-us-testing-bm-1-trigger'
+ auto-trigger-name: 'qtip-daily-dell-pod1-trigger'
<<: *brahmaputra
- orange-pod2:
installer: joid
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *brahmaputra
- - dell-us-deploying-bm3:
- installer: fuel
- auto-trigger-name: 'qtip-daily-dell-us-deploying-bm3-trigger'
- <<: *brahmaputra
-
#--------------------------------
# master
#--------------------------------
@@ -171,12 +166,7 @@
#################
- trigger:
- name: 'qtip-daily-dell-us-deploying-bm3-trigger'
- triggers:
- - timed: '0 0 * * *'
-
-- trigger:
- name: 'qtip-daily-dell-us-testing-bm-1-trigger'
+ name: 'qtip-daily-dell-pod1-trigger'
triggers:
- timed: '0 3 * * *'