From fcbba6cefcc3ca25b6216f584c2a6f081b69a632 Mon Sep 17 00:00:00 2001
From: dongwenjuan <dong.wenjuan@zte.com.cn>
Date: Fri, 15 Sep 2017 14:50:27 +0800
Subject: fix doctor trigger files
Change-Id: I89713020ea17ddeedc32c581ac14b38d9f2afe44
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
---
jjb/doctor/doctor.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'jjb/doctor')
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
--
cgit