diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-12-06 07:16:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-06 07:16:06 +0000 |
| commit | 40257d168c61e4201cf2312c5b3b8dd7fcd4503e (patch) | |
| tree | 9e789fe20dc4ef4bb3cac37f0d1ab0a1c3d9308f | |
| parent | 5f4cd7d30efd8bf917c9a01b2173c68c853d52d0 (diff) | |
| parent | 24504cee3d619d00215937a025a83224492f12ec (diff) | |
Merge "dovetail: to support multi_testsuite"
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 13 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index b70bfc67b..91f1b72bf 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -159,7 +159,7 @@ #dovetail only master by now, not sync with A/B/C branches #here the stream means the SUT stream, dovetail stream is defined in its own job - trigger-builds: - - project: 'dovetail-compass-{pod}-basic-{stream}' + - project: 'dovetail-compass-{pod}-debug-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 29212005d..263e3b261 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -112,7 +112,9 @@ <<: *master #-------------------------------- testsuite: - - 'basic' + - 'debug' + - 'proposed_tests' + - 'compliace_set' jobs: - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}' @@ -159,6 +161,10 @@ name: CI_DEBUG default: 'true' description: "Show debug output information" + - string: + name: TESTSUITE + default: '{testsuite}' + description: "dovetail testsuite to run" scm: - git-scm: @@ -170,7 +176,7 @@ - description-setter: description: "POD: $NODE_NAME" - 'dovetail-cleanup' - - 'dovetail-{testsuite}' + - 'dovetail-run' publishers: - archive: @@ -182,11 +188,12 @@ # builder macros ######################## - builder: - name: dovetail-basic + name: dovetail-run builders: - shell: !include-raw: ./dovetail-run.sh + - builder: name: dovetail-fetch-os-creds builders: diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 098b7db0c..c792b1e6b 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -47,8 +47,8 @@ docker pull opnfv/dovetail:$DOCKER_TAG >$redirect # Run docker echo "Dovetail: docker running..." -sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} \ -"/home/opnfv/dovetail/dovetail/run.py" +cmds = "${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite $TESTSUITE" +sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} ${cmds} echo "Dovetail: store results..." sudo cp -r /home/opnfv/dovetail/results ./ |