Slave names will be as below.
- huawei-us-deploy-bare-1 -> huawei-pod1
- huawei-us-deploy-bare-2 -> huawei-pod2
- huawei-sh-test-2-defaults -> huawei-pod3
- huawei-sh-pod6 -> huawei-pod4
- huawei-us-deploy-vm-1 -> huawei-virtual1
- huawei-us-deploy-vm-2 -> huawei-virtual2
- huawei-us-deploy-vm-3 -> huawei-virtual3
- huawei-us-deploy-vm-4 -> huawei-virtual4
huawei-sh-pod4 will be removed from Jenkins.
Please note that this change will result in removal of existing jobs.
This is not that crucial since the use of labels will result in same.
Change-Id: I63798c799a402b1694ee0767ffdb45a597897cd9
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
installer: joid
disabled: true
<<: *brahmaputra
- - huawei-us-deploy-bare-1:
+ - huawei-pod1:
installer: compass
disabled: true
<<: *brahmaputra
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-huawei-us-deploy-bare-1'
+ name: 'bottlenecks-params-huawei-pod1'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
#--------------------------------
# brahmaputra
#--------------------------------
- - huawei-us-deploy-bare-1:
+ - huawei-pod1:
os-version: 'trusty'
<<: *brahmaputra
- huawei-virtual:
#--------------------------------
# master
#--------------------------------
- - huawei-us-deploy-bare-2:
+ - huawei-pod2:
os-version: 'centos7'
<<: *master
- intel-pod8:
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod2-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod2-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-trigger'
triggers:
- timed: '0 3 * * * '
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod1-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod1-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
stream:
- master:
- slave_name: 'huawei-us-deploy-vm-1'
+ slave_name: 'huawei-virtual1'
branch: '{stream}'
gs-pathname: ''
- brahmaputra:
- slave_name: 'huawei-us-deploy-vm-2'
+ slave_name: 'huawei-virtual2'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- orange-pod2:
installer: joid
<<: *brahmaputra
- - huawei-us-deploy-bare-1:
+ - huawei-pod1:
installer: compass
<<: *brahmaputra
- ericsson-pod1:
- virtual:
installer: joid
<<: *master
- - huawei-us-deploy-bare-2:
+ - huawei-pod2:
installer: compass
<<: *master
- nokia-pod1:
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-us-deploy-bare-1-defaults'
+ name: 'huawei-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - huawei-us-deploy-bare-1
+ - huawei-pod1
default-slaves:
- - huawei-us-deploy-bare-1
+ - huawei-pod1
- string:
name: INSTALLER_VERSION
default: stable
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-us-deploy-bare-2-defaults'
+ name: 'huawei-pod2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - huawei-us-deploy-bare-2
+ - huawei-pod2
default-slaves:
- - huawei-us-deploy-bare-2
+ - huawei-pod2
- string:
name: INSTALLER_VERSION
default: stable
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-sh-test-2-defaults'
+ name: 'huawei-pod3-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - huawei-sh-test-2
+ - huawei-pod3
default-slaves:
- - huawei-sh-test-2
+ - huawei-pod3
- label:
name: SLAVE_LABEL
default: 'huawei-test'
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-sh-pod6-defaults'
+ name: 'huawei-pod4-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - huawei-sh-pod6
+ - huawei-pod4
default-slaves:
- - huawei-sh-pod6
+ - huawei-pod4
- label:
name: SLAVE_LABEL
default: 'huawei-test'
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *brahmaputra
- - huawei-us-deploy-bare-1:
+ - huawei-pod1:
installer: compass
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - huawei-us-deploy-bare-2:
+ - huawei-pod2:
installer: compass
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - huawei-sh-test-2:
+ - huawei-pod3:
installer: compass
suite: daily
- auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger'
+ auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger'
<<: *master
- - huawei-sh-pod6:
+ - huawei-pod4:
installer: compass
suite: daily
- auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger'
+ auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
- virtual:
installer: joid
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-us-deploy-bare-1'
+ name: 'yardstick-params-huawei-pod1'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-us-deploy-bare-2'
+ name: 'yardstick-params-huawei-pod2'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-sh-test-2'
+ name: 'yardstick-params-huawei-pod3'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-sh-pod6'
+ name: 'yardstick-params-huawei-pod4'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- timed: '0 1 * * *'
- trigger:
- name: 'yardstick-daily-huawei-sh-test-2-trigger'
+ name: 'yardstick-daily-huawei-pod3-trigger'
triggers:
- timed: '0 1 * * *'
- trigger:
- name: 'yardstick-daily-huawei-sh-pod6-trigger'
+ name: 'yardstick-daily-huawei-pod4-trigger'
triggers:
- timed: '0 1 * * *'