diff options
| author |   Ryota Mibu <r-mibu@cq.jp.nec.com> | 2017-09-18 11:59:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-18 11:59:52 +0000 |
| commit | 3dc665c357d798a28ce05f37c92de92a9c30c84d (patch) | |
| tree | 55a56553d3e68852f5109ee7b61f5a2208716f6d | |
| parent | cf7a4aa78910d8c401d018a769863097e63b7f4a (diff) | |
| parent | fcbba6cefcc3ca25b6216f584c2a6f081b69a632 (diff) | |
Merge "fix doctor trigger files"
| -rw-r--r-- | jjb/doctor/doctor.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index b007e1432..7205cded3 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -82,7 +82,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: ANT - pattern: 'tests/**' + pattern: 'doctor_tests/**' builders: - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" @@ -108,7 +108,7 @@ - '{auto-trigger-name}': project: '{project}' branch: '{branch}' - files: 'tests/**' + files: 'doctor_tests/**' builders: - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" @@ -174,7 +174,7 @@ - '{auto-trigger-name}': project: '{project}' branch: '{branch}' - files: 'tests/**' + files: 'doctor_tests/**' builders: - 'clean-workspace-log' @@ -195,11 +195,11 @@ functest_log="$HOME/opnfv/functest/results/{stream}/$FUNCTEST_SUITE_NAME.log" # NOTE: checking the test result, as the previous job could return # 0 regardless the result of doctor test scenario. - grep -e ' OK$' $functest_log || exit 1 + grep -e 'doctor test successfully' $functest_log || exit 1 publishers: - archive: - artifacts: 'tests/*.log' + artifacts: 'doctor_tests/*.log' - archive: artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log' - email-jenkins-admins-on-failure |