summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-17 10:02:18 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-20 08:55:43 +0000
commit1e67c1ac934118ddb84fe05a656484107e19ee65 (patch)
treefe402f3605fe1d9baab6e4d2adf8b4d81117df32 /jjb/compass4nfv
parent0fb2530a0e88a08e9d77a23073b3cd576ce6e47f (diff)
Rename Huawei Jenkins slaves
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>
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml24
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml4
2 files changed, 14 insertions, 14 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index c9560a572..ce9193cb5 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -22,7 +22,7 @@
#--------------------------------
# brahmaputra
#--------------------------------
- - huawei-us-deploy-bare-1:
+ - huawei-pod1:
os-version: 'trusty'
<<: *brahmaputra
- huawei-virtual:
@@ -31,7 +31,7 @@
#--------------------------------
# master
#--------------------------------
- - huawei-us-deploy-bare-2:
+ - huawei-pod2:
os-version: 'centos7'
<<: *master
- intel-pod8:
@@ -213,43 +213,43 @@
# 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:
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index ed748aacb..4898b8726 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -8,11 +8,11 @@
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}'