diff options
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 24 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 4 |
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}' |