diff options
| author |   meimei <meimei@huawei.com> | 2016-01-21 14:43:01 +0800 |
|---|---|---|
| committer | mei mei <meimei@huawei.com> | 2016-01-23 02:26:12 +0000 |
| commit | 4ab6aad6da36d74111bfe3b81d91b4668eeafdd9 (patch) | |
| tree | dad6af610626db1b34ca3549f0d88b3599324b9f /jjb/compass4nfv/compass-ci-jobs.yml | |
| parent | e5f4e9511ecdb727b593ef125916172d0bed3017 (diff) | |
[compass] enable virtual-deployment workflow
Change-Id: I2ab9c1d880b7286343ab0e2e8456dddd25378a7b
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 64a4b317c..f43ab59ec 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -24,11 +24,15 @@ #-------------------------------- - huawei-us-deploy-bare-1: <<: *brahmaputra + - huawei-virtual: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- - intel-pod8: <<: *master + - huawei-virtual: + <<: *master scenario: - 'os-nosdn-nofeature-ha': @@ -103,7 +107,7 @@ condition: COMPLETED projects: - name: 'functest-compass-{pod}-daily-{stream}' - current-parameters: false + current-parameters: true predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - multijob: @@ -111,7 +115,7 @@ condition: COMPLETED projects: - name: 'yardstick-compass-{pod}-daily-{stream}' - current-parameters: false + current-parameters: true predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER @@ -204,7 +208,16 @@ choices: - 'trusty' - 'centos7' - +- parameter: + name: 'huawei-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'huawei-deploy-vm' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on these Jenkins Slaves' ######################## # trigger macros ######################## @@ -231,7 +244,7 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '0 16 * * *' + - timed: '' - trigger: name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger' triggers: @@ -240,3 +253,19 @@ name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '0 16 * * *' +- trigger: + name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '0 16 * * *' +- trigger: + name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '' |