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-project-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-project-jobs.yml')
-rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 92 |
1 files changed, 3 insertions, 89 deletions
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 565aaa33f..0316e6f70 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -33,8 +33,7 @@ - 'compass-verify-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-deploy-virtual-{scenario}-{stream}' - - 'compass-virtual-daily-{stream}' + ######################## # job templates @@ -109,9 +108,9 @@ fingerprint: true - job-template: - name: 'compass-virtual-daily-{stream}' + name: 'compass-build-iso-{stream}' - node: huawei-build + node: ericsson-build concurrent: true @@ -140,52 +139,6 @@ - timed: 'H 14 * * *' builders: - - trigger-builds: - - project: 'compass-build-iso-{stream}' - git-revision: true - block: true - - trigger-builds: - - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}' - git-revision: true - block: false - - trigger-builds: - - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' - git-revision: true - block: false - - trigger-builds: - - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}' - git-revision: true - block: false - -- job-template: - name: 'compass-build-iso-{stream}' - - node: ericsson-build - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - - parameters: - - project-parameter: - project: '{project}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - '{node}-defaults' - - '{installer}-defaults' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - builders: - shell: !include-raw: ./compass-build.sh - shell: @@ -226,46 +179,7 @@ - shell: !include-raw: ./compass-makeppa.sh -- job-template: - name: 'compass-deploy-virtual-{scenario}-{stream}' - - disabled: false - - node: '{node}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - - parameters: - - project-parameter: - project: '{project}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - '{node}-defaults' - - '{installer}-defaults' - builders: - - shell: - !include-raw: ./compass-workspace-precleanup.sh - - shell: - !include-raw: ./compass-download-artifact.sh - - shell: - !include-raw: ./compass-deploy-virtual.sh - - publishers: - - archive: - artifacts: 'ansible.log' - allow-empty: 'true' - fingerprint: true ######################## # parameter macros |