Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Functest] Support functest-suite with Alpine containers
[releng.git]
/
jjb
/
doctor
/
doctor.yml
diff --git
a/jjb/doctor/doctor.yml
b/jjb/doctor/doctor.yml
index
5bb8f74
..
c806429
100644
(file)
--- a/
jjb/doctor/doctor.yml
+++ b/
jjb/doctor/doctor.yml
@@
-9,7
+9,7
@@
gs-pathname: ''
docker-tag: 'latest'
disabled: false
gs-pathname: ''
docker-tag: 'latest'
disabled: false
- -
danube
:
+ -
euphrates
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
@@
-30,22
+30,16
@@
task:
- verify:
task:
- verify:
- profiler: 'none'
auto-trigger-name: 'doctor-verify'
is-python: false
auto-trigger-name: 'doctor-verify'
is-python: false
- - profiling:
- profiler: 'poc'
- auto-trigger-name: 'experimental'
- is-python: false
- python-verify:
- python-verify:
- profiler: 'none'
auto-trigger-name: 'doctor-verify'
is-python: true
pod:
auto-trigger-name: 'doctor-verify'
is-python: true
pod:
- - arm
-pod2
:
+ - arm
band-baremetal
:
slave-label: '{pod}'
slave-label: '{pod}'
- - arm
-pod3
:
+ - arm
band-virtual
:
slave-label: '{pod}'
jobs:
slave-label: '{pod}'
jobs:
@@
-88,7
+82,7
@@
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'tests/**'
+ pattern: '
doctor_
tests/**'
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@
-114,6
+108,7
@@
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
+ files: 'doctor_tests/**'
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@
-147,12
+142,15
@@
default: 'os-nosdn-nofeature-ha'
description: 'Scenario to deploy and test'
# functest-suite-parameter
default: 'os-nosdn-nofeature-ha'
description: 'Scenario to deploy and test'
# functest-suite-parameter
+ - string:
+ name: FUNCTEST_MODE
+ default: 'testcase'
- string:
name: FUNCTEST_SUITE_NAME
default: 'doctor-notification'
- string:
name: TESTCASE_OPTIONS
- string:
name: FUNCTEST_SUITE_NAME
default: 'doctor-notification'
- string:
name: TESTCASE_OPTIONS
- default: '-e INSPECTOR_TYPE={inspector} -e P
ROFILER_TYPE={profiler} -e P
YTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
+ default: '-e INSPECTOR_TYPE={inspector} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
description: 'Addtional parameters specific to test case(s)'
# functest-parameter
- string:
description: 'Addtional parameters specific to test case(s)'
# functest-parameter
- string:
@@
-179,6
+177,7
@@
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
+ files: 'doctor_tests/**'
builders:
- 'clean-workspace-log'
builders:
- 'clean-workspace-log'
@@
-196,16
+195,17
@@
wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O functest/ci/download_images.sh
- 'functest-suite-builder'
- shell: |
wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O functest/ci/download_images.sh
- 'functest-suite-builder'
- shell: |
- functest_log="$HOME/opnfv/functest/results/{stream}/
{project}
.log"
+ 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.
# 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:
publishers:
- archive:
- artifacts: 'tests/*.log'
+ artifacts: '
doctor_
tests/*.log'
- archive:
- archive:
- artifacts: 'functest_results/{project}.log'
+ artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
+ - email-jenkins-admins-on-failure
#####################################
#####################################
@@
-234,7
+234,7
@@
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: '
tests/**
'
+ pattern: '
{files}
'
skip-vote:
successful: true
failed: true
skip-vote:
successful: true
failed: true