summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-07-18 06:31:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-18 06:31:14 +0000
commit91669b39a0a6023cee20578f49efe6e633738b06 (patch)
tree3acd44c0ae6722715d0063a9bf6c4220a5dca3bf /jjb
parent36a9f477a6b25c7bf1aa64e38b0df90316a73161 (diff)
parent44c6fed1fac2ec2340edc14437c9200bc21e0745 (diff)
Merge "[dovetail] Add TESTAREA to support run mandatory or optional test cases"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yaml84
-rwxr-xr-xjjb/dovetail/dovetail-run.sh12
2 files changed, 95 insertions, 1 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml
index a95617ae4..8d47616d8 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yaml
+++ b/jjb/dovetail/dovetail-ci-jobs.yaml
@@ -178,8 +178,13 @@
- 'default'
- 'proposed_tests'
+ testarea:
+ - 'mandatory'
+ - 'optional'
+
jobs:
- 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
+ - 'dovetail-{SUT}-{pod}-{testsuite}-{testarea}-{stream}'
################################
# job templates
@@ -231,6 +236,85 @@
default: '{testsuite}'
description: "dovetail testsuite to run"
- string:
+ name: TESTAREA
+ default: 'all'
+ description: "dovetail testarea to run"
+ - string:
+ name: DOVETAIL_REPO_DIR
+ default: "/home/opnfv/dovetail"
+ description: "Directory where the dovetail repository is cloned"
+ - string:
+ name: SUT_BRANCH
+ default: '{branch}'
+ description: "SUT branch"
+
+ scm:
+ - git-scm
+
+ builders:
+ - description-setter:
+ description: "POD: $NODE_NAME"
+ - 'dovetail-cleanup'
+ - 'dovetail-run'
+
+ publishers:
+ - archive:
+ artifacts: 'results/**/*'
+ allow-empty: true
+ fingerprint: true
+ - email-jenkins-admins-on-failure
+
+- job-template:
+ name: 'dovetail-{SUT}-{pod}-{testsuite}-{testarea}-{stream}'
+
+ disabled: false
+
+ concurrent: true
+
+ properties:
+ - logrotate-default
+ - throttle:
+ enabled: true
+ max-per-node: 1
+ option: 'project'
+
+ wrappers:
+ - build-name:
+ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+ - timeout:
+ timeout: 300
+ abort: true
+ - fix-workspace-permissions
+
+ triggers:
+ - '{auto-trigger-name}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{dovetail-branch}'
+ - '{SUT}-defaults'
+ - '{slave-label}-defaults'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: 'Tag to pull dovetail docker image'
+ - string:
+ name: CI_DEBUG
+ default: 'true'
+ description: "Show debug output information"
+ - string:
+ name: TESTSUITE
+ default: '{testsuite}'
+ description: "dovetail testsuite to run"
+ - string:
+ name: TESTAREA
+ default: '{testarea}'
+ description: "dovetail testarea to run"
+ - string:
name: DOVETAIL_REPO_DIR
default: "/home/opnfv/dovetail"
description: "Directory where the dovetail repository is cloned"
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 0b3510863..c92ebba02 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -362,7 +362,17 @@ else
testsuite="--testsuite ${TESTSUITE}"
fi
-run_cmd="dovetail run ${testsuite} -d"
+if [[ ${TESTAREA} == 'mandatory' ]]; then
+ testarea='--mandatory'
+elif [[ ${TESTAREA} == 'optional' ]]; then
+ testarea="--optional"
+elif [[ ${TESTAREA} == 'all' ]]; then
+ testarea=""
+else
+ testarea="--testarea ${TESTAREA}"
+fi
+
+run_cmd="dovetail run ${testsuite} ${testarea} -d"
echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}