Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[daisy] Run fraser jobs on zte-pod3
[releng.git]
/
jjb
/
doctor
/
doctor.yml
diff --git
a/jjb/doctor/doctor.yml
b/jjb/doctor/doctor.yml
index
c3760a7
..
5732100
100644
(file)
--- a/
jjb/doctor/doctor.yml
+++ b/
jjb/doctor/doctor.yml
@@
-16,10
+16,15
@@
docker-tag: 'stable'
disabled: false
docker-tag: 'stable'
disabled: false
+ # feature projects' tests are not triggered by functest
+ # doctor verify Pods need to deploy with these scenario
installer:
installer:
- - 'apex'
- - 'fuel'
- - 'daisy'
+ - 'apex':
+ scenario: 'os-nosdn-kvm-ha'
+ - 'fuel':
+ scenario: 'os-nosdn-ovs-ha'
+ - 'daisy':
+ scenario: 'os-nosdn-ovs_dpdk-noha'
arch:
- 'x86_64'
arch:
- 'x86_64'
@@
-63,7
+68,7
@@
# in phase jobs
echo "Triggering phase jobs!"
- multijob:
# in phase jobs
echo "Triggering phase jobs!"
- multijob:
- name: 'doctor-verify
-apex-inspector
'
+ name: 'doctor-verify'
execution-type: PARALLEL
projects:
- name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
execution-type: PARALLEL
projects:
- name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
@@
-74,12
+79,7
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
git-revision: true
- - multijob:
- name: 'doctor-verify-fuel-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
- name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
@@
-88,12
+88,7
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
git-revision: true
- - multijob:
- name: 'doctor-verify-fuel-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
- name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-101,12
+96,7
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
git-revision: true
- - multijob:
- name: 'doctor-verify-daisy-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
- name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
@@
-115,7
+105,6
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
- job-template:
git-revision: true
- job-template:
@@
-162,7
+151,7
@@
description: 'Remove downloaded docker images (opnfv/functest:*)'
- string:
name: DEPLOY_SCENARIO
description: 'Remove downloaded docker images (opnfv/functest:*)'
- string:
name: DEPLOY_SCENARIO
- default: '
os-nosdn-nofeature-ha
'
+ default: '
{scenario}
'
description: 'Scenario to deploy and test'
- parameter:
description: 'Scenario to deploy and test'
- parameter: