diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-03 00:07:24 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-05 01:49:26 +0200 |
commit | ad0c91f390ff90ddf293ff6654e9db6cade227b4 (patch) | |
tree | 930f7386239fada829a35e14bc659cf557302a2d /jjb/fuel/fuel-verify-jobs.yml | |
parent | 444ec6314f41400bb4e1cb8dfd65f66083cb794e (diff) |
fuel, armband: verify jobs: Enable virtual deploy
Enable virtual deploy phase for verify multijob for both projects.
Since fuel-defaults already define SSH_KEY param, drop it from
individual jobs.
Fuel:
- drop merge jobs, which used to perform virtual deploys based on
ISO created during verify job;
- cleanup fuel-download-artifact (rm support for merge/verify);
Armband:
- while at it, remove "opnfv-build-enea-defaults", preparing for
arm-build2's retirement.
JIRA: FUEL-278
JIRA: FUEL-287
Change-Id: I354d72d88187e41070f44c723ccc651a0bb9b021
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb/fuel/fuel-verify-jobs.yml')
-rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 899be9a4a..73d47637f 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,11 +21,11 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' - 'deploy-virtual': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' - 'smoke-test': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' ##################################### # jobs ##################################### @@ -50,6 +50,11 @@ enabled: true max-total: 4 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-os-.*?-virtual-daily-.*' + block-level: 'NODE' scm: - git-scm-gerrit @@ -94,7 +99,8 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'fuel-virtual-defaults': + installer: '{installer}' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -155,7 +161,8 @@ - logrotate-default - throttle: enabled: true - max-total: 6 + max-total: 2 + max-per-node: 1 option: 'project' - build-blocker: use-build-blocker: true @@ -177,6 +184,8 @@ project: '{project}' branch: '{branch}' - '{slave-label}-defaults' + - 'fuel-virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -199,10 +208,8 @@ - builder: name: 'fuel-verify-deploy-virtual-macro' builders: - - shell: | - #!/bin/bash - - echo "Not activated!" + - shell: + !include-raw-escape: ./fuel-deploy.sh - builder: name: 'fuel-verify-smoke-test-macro' |