diff options
| author |   ting wu <ting.wu@enea.com> | 2018-03-29 13:39:32 +0200 |
|---|---|---|
| committer | ting wu <ting.wu@enea.com> | 2018-04-06 14:54:38 +0200 |
| commit | 696a4f785750d878fdcfe1218d52d6a863bcc987 (patch) | |
| tree | 8ed6baa7ea5d5bdeeaa4125776e22425aae6731e /jjb/fuel | |
| parent | 2913820a65ed1201c616c188a1af99eb53a9994c (diff) | |
fuel, armband: basic healthcheck in verify jobs
Enable Functest based gating for jobs:
- fuel-verify-*
- armband-verify-*
This includes Functest suite 'healthcheck' and testcase 'vping_ssh',
similar to Compass4NFV verify jobs.
While at it, remove 'basic' phase from verify jobs, as linting is
handled via separate jobs on Jenkins master and there's no other
reason to keep it around.
JIRA: FUEL-340
Change-Id: I11dce6998d7ac16e68cf2b9d72a1ed6b23ca2483
Signed-off-by: ting wu <ting.wu@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 54 |
1 files changed, 20 insertions, 34 deletions
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index d81b0ce92..bef6a5094 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,12 +21,8 @@ # patch verification phases ##################################### phase: - - 'basic': - slave-label: 'fuel-virtual' - 'deploy-virtual': slave-label: 'fuel-virtual' - - 'smoke-test': - slave-label: 'fuel-virtual' ##################################### # jobs ##################################### @@ -105,15 +101,18 @@ installer: '{installer}' - '{installer}-defaults': gs-pathname: '{gs-pathname}' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' builders: - description-setter: description: "Built on $NODE_NAME" - multijob: - name: basic + name: deploy-virtual condition: SUCCESSFUL projects: - - name: 'fuel-verify-basic-{stream}' + - name: 'fuel-verify-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | BRANCH=$BRANCH @@ -123,33 +122,37 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: true + - multijob: - name: deploy-virtual + name: smoke-test condition: SUCCESSFUL projects: - - name: 'fuel-verify-deploy-virtual-{stream}' + # Use Functest job definition from jjb/functest/functest-daily-jobs + - name: 'functest-fuel-virtual-suite-{stream}' current-parameters: false predefined-parameters: | + FUNCTEST_MODE=tier + FUNCTEST_TIER=healthcheck + DEPLOY_SCENARIO=$DEPLOY_SCENARIO BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE + node-parameters: true + kill-phase-on: NEVER abort-all-job: true - - multijob: - name: smoke-test - condition: SUCCESSFUL - projects: - - name: 'fuel-verify-smoke-test-{stream}' + - name: 'functest-fuel-virtual-suite-{stream}' current-parameters: false predefined-parameters: | + FUNCTEST_MODE=testcase + FUNCTEST_SUITE_NAME=vping_ssh + DEPLOY_SCENARIO=$DEPLOY_SCENARIO BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE + node-parameters: true + kill-phase-on: NEVER abort-all-job: true - job-template: @@ -170,7 +173,6 @@ use-build-blocker: true blocking-jobs: - 'fuel-verify-deploy-.*' - - 'fuel-verify-test-.*' block-level: 'NODE' scm: @@ -200,23 +202,7 @@ # builder macros ##################################### - builder: - name: 'fuel-verify-basic-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: name: 'fuel-verify-deploy-virtual-macro' builders: - shell: !include-raw: ./fuel-deploy.sh - -- builder: - name: 'fuel-verify-smoke-test-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" |