diff options
Diffstat (limited to 'jjb/armband')
-rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 7 | ||||
-rw-r--r-- | jjb/armband/armband-verify-jobs.yml | 25 |
2 files changed, 18 insertions, 14 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index b27b053a4..d440d8374 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -82,6 +82,7 @@ use-build-blocker: true blocking-jobs: - '{installer}-os-.*?-{pod}-daily-.*' + - 'armband-verify-.*' block-level: 'NODE' wrappers: @@ -215,10 +216,6 @@ name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." - - string: - name: SSH_KEY - default: "/tmp/mcp.rsa" - description: "Path to private SSH key to access environment nodes. For MCP deployments only." ######################## # trigger macros @@ -283,4 +280,4 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-euphrates-trigger' triggers: - - timed: ''
\ No newline at end of file + - timed: '' diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml index 56f70d68b..b30fbafb2 100644 --- a/jjb/armband/armband-verify-jobs.yml +++ b/jjb/armband/armband-verify-jobs.yml @@ -21,11 +21,11 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-enea' + slave-label: 'armband-virtual' - 'deploy-virtual': - slave-label: 'opnfv-build-enea' + slave-label: 'armband-virtual' - 'smoke-test': - slave-label: 'opnfv-build-enea' + slave-label: 'armband-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-enea-defaults' + - 'armband-virtual-defaults': + installer: '{installer}' - 'armband-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' + - 'armband-virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - 'armband-verify-defaults': gs-pathname: '{gs-pathname}' @@ -199,10 +208,8 @@ - builder: name: 'armband-verify-deploy-virtual-macro' builders: - - shell: | - #!/bin/bash - - echo "Not activated!" + - shell: + !include-raw-escape: ../fuel/fuel-deploy.sh - builder: name: 'armband-verify-smoke-test-macro' |